Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json

Issue 2014373002: chromium_tests: apply chromium.get_env() when running tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 [ 1 [
2 { 2 {
3 "cmd": [ 3 "cmd": [
4 "python", 4 "python",
5 "-u", 5 "-u",
6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", 6 "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
7 "--master", 7 "--master",
8 "chromium.linux", 8 "chromium.linux",
9 "--builder", 9 "--builder",
10 "Android Tests", 10 "Android Tests",
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 "name": "extract build" 321 "name": "extract build"
322 }, 322 },
323 { 323 {
324 "cmd": [ 324 "cmd": [
325 "python", 325 "python",
326 "-u", 326 "-u",
327 "RECIPE_MODULE[build::adb]/resources/list_devices.py", 327 "RECIPE_MODULE[build::adb]/resources/list_devices.py",
328 "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'd evices']", 328 "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'd evices']",
329 "/path/to/tmp/json" 329 "/path/to/tmp/json"
330 ], 330 ],
331 "env": {
332 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
333 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
334 },
331 "name": "List adb devices", 335 "name": "List adb devices",
332 "~followup_annotations": [ 336 "~followup_annotations": [
333 "@@@STEP_LOG_LINE@json.output@[@@@", 337 "@@@STEP_LOG_LINE@json.output@[@@@",
334 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@", 338 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
335 "@@@STEP_LOG_LINE@json.output@]@@@", 339 "@@@STEP_LOG_LINE@json.output@]@@@",
336 "@@@STEP_LOG_END@json.output@@@" 340 "@@@STEP_LOG_END@json.output@@@"
337 ] 341 ]
338 }, 342 },
339 { 343 {
340 "cmd": [ 344 "cmd": [
341 "python", 345 "python",
342 "-u", 346 "-u",
343 "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sy s.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess .check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path , '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (dev ice)\n", 347 "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sy s.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess .check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path , '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (dev ice)\n",
344 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 348 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
345 "014E1F310401C009" 349 "014E1F310401C009"
346 ], 350 ],
351 "env": {
352 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
353 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
354 },
347 "name": "Root devices", 355 "name": "Root devices",
348 "~followup_annotations": [ 356 "~followup_annotations": [
349 "@@@STEP_LOG_LINE@python.inline@@@@", 357 "@@@STEP_LOG_LINE@python.inline@@@@",
350 "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", 358 "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
351 "@@@STEP_LOG_LINE@python.inline@import sys@@@", 359 "@@@STEP_LOG_LINE@python.inline@import sys@@@",
352 "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@", 360 "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
353 "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@", 361 "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
354 "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@", 362 "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
355 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'root'])@@@", 363 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'root'])@@@",
356 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'wait-for-device'])@@@", 364 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'wait-for-device'])@@@",
357 "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (de vice)@@@", 365 "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (de vice)@@@",
358 "@@@STEP_LOG_END@python.inline@@@" 366 "@@@STEP_LOG_END@python.inline@@@"
359 ] 367 ]
360 }, 368 },
361 { 369 {
362 "cmd": [ 370 "cmd": [
363 "python", 371 "python",
364 "-u", 372 "-u",
365 "[SLAVE_BUILD]/src/build/symlink.py", 373 "[SLAVE_BUILD]/src/build/symlink.py",
366 "-f", 374 "-f",
367 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 375 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
368 "~/adb" 376 "~/adb"
369 ], 377 ],
378 "env": {
379 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
380 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
381 },
370 "name": "create adb symlink" 382 "name": "create adb symlink"
371 }, 383 },
372 { 384 {
373 "cmd": [ 385 "cmd": [
374 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 386 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
375 "--", 387 "--",
376 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", 388 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
377 "[SLAVE_BUILD]/src/out/logcat" 389 "[SLAVE_BUILD]/src/out/logcat"
378 ], 390 ],
379 "env": { 391 "env": {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 "/tmp/device_monitor.pid", 548 "/tmp/device_monitor.pid",
537 "--", 549 "--",
538 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py" , 550 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py" ,
539 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 551 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
540 "[\"07a00ca4\"]", 552 "[\"07a00ca4\"]",
541 "chromium.linux", 553 "chromium.linux",
542 "Android Tests", 554 "Android Tests",
543 "--blacklist-file", 555 "--blacklist-file",
544 "[SLAVE_BUILD]/src/out/bad_devices.json" 556 "[SLAVE_BUILD]/src/out/bad_devices.json"
545 ], 557 ],
558 "env": {
559 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
560 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
561 },
546 "name": "spawn_device_monitor" 562 "name": "spawn_device_monitor"
547 }, 563 },
548 { 564 {
549 "cmd": [ 565 "cmd": [
550 "python", 566 "python",
551 "-u", 567 "-u",
552 "[SLAVE_BUILD]/src/out/Release/bin/run_blimp_test_apk", 568 "[SLAVE_BUILD]/src/out/Release/bin/run_blimp_test_apk",
553 "--blacklist-file", 569 "--blacklist-file",
554 "[SLAVE_BUILD]/src/out/bad_devices.json", 570 "[SLAVE_BUILD]/src/out/bad_devices.json",
555 "--verbose", 571 "--verbose",
556 "--json-results-file", 572 "--json-results-file",
557 "/path/to/tmp/json" 573 "/path/to/tmp/json"
558 ], 574 ],
575 "env": {
576 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
577 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
578 },
559 "name": "Instrumentation test blimp_test_apk", 579 "name": "Instrumentation test blimp_test_apk",
560 "~followup_annotations": [ 580 "~followup_annotations": [
561 "step returned non-zero exit code: 1", 581 "step returned non-zero exit code: 1",
562 "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@", 582 "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
563 "@@@STEP_FAILURE@@@" 583 "@@@STEP_FAILURE@@@"
564 ] 584 ]
565 }, 585 },
566 { 586 {
567 "cmd": [ 587 "cmd": [
568 "python", 588 "python",
569 "-u", 589 "-u",
570 "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py ", 590 "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py ",
571 "--input-gtest-json", 591 "--input-gtest-json",
572 "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"outp ut_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\" elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}", 592 "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"outp ut_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\" elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
573 "--master-name", 593 "--master-name",
574 "chromium.linux", 594 "chromium.linux",
575 "--builder-name", 595 "--builder-name",
576 "Android Tests", 596 "Android Tests",
577 "--build-number", 597 "--build-number",
578 "571", 598 "571",
579 "--test-type", 599 "--test-type",
580 "blimp_test_apk", 600 "blimp_test_apk",
581 "--test-results-server", 601 "--test-results-server",
582 "test-results.appspot.com", 602 "test-results.appspot.com",
583 "--chrome-revision", 603 "--chrome-revision",
584 "refs/heads/master@{#170242}" 604 "refs/heads/master@{#170242}"
585 ], 605 ],
606 "env": {
607 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
608 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
609 },
586 "name": "Upload to test-results [blimp_test_apk]" 610 "name": "Upload to test-results [blimp_test_apk]"
587 }, 611 },
588 { 612 {
589 "cmd": [ 613 "cmd": [
590 "python", 614 "python",
591 "-u", 615 "-u",
592 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 616 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
593 "--action", 617 "--action",
594 "stop", 618 "stop",
595 "--pid-file-path", 619 "--pid-file-path",
596 "/tmp/device_monitor.pid" 620 "/tmp/device_monitor.pid"
597 ], 621 ],
622 "env": {
623 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
624 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
625 },
598 "name": "shutdown_device_monitor" 626 "name": "shutdown_device_monitor"
599 }, 627 },
600 { 628 {
601 "cmd": [ 629 "cmd": [
602 "python", 630 "python",
603 "-u", 631 "-u",
604 "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", 632 "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
605 "--output-path", 633 "--output-path",
606 "[SLAVE_BUILD]/src/out/Release/full_log", 634 "[SLAVE_BUILD]/src/out/Release/full_log",
607 "[SLAVE_BUILD]/src/out/logcat" 635 "[SLAVE_BUILD]/src/out/logcat"
608 ], 636 ],
637 "env": {
638 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
639 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
640 },
609 "name": "logcat_dump" 641 "name": "logcat_dump"
610 }, 642 },
611 { 643 {
612 "cmd": [ 644 "cmd": [
613 "python", 645 "python",
614 "-u", 646 "-u",
615 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", 647 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
616 "--", 648 "--",
617 "[DEPOT_TOOLS]/gsutil.py", 649 "[DEPOT_TOOLS]/gsutil.py",
618 "--force-version", 650 "--force-version",
619 "4.7", 651 "4.7",
620 "-o", 652 "-o",
621 "GSUtil:parallel_composite_upload_threshold=50M", 653 "GSUtil:parallel_composite_upload_threshold=50M",
622 "----", 654 "----",
623 "cp", 655 "cp",
624 "[SLAVE_BUILD]/src/out/Release/full_log", 656 "[SLAVE_BUILD]/src/out/Release/full_log",
625 "gs://chromium-android/logcat_dumps/Android Tests/571" 657 "gs://chromium-android/logcat_dumps/Android Tests/571"
626 ], 658 ],
659 "env": {
660 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
661 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
662 },
627 "name": "gsutil upload", 663 "name": "gsutil upload",
628 "~followup_annotations": [ 664 "~followup_annotations": [
629 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi d/logcat_dumps/Android Tests/571@@@" 665 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi d/logcat_dumps/Android Tests/571@@@"
630 ] 666 ]
631 }, 667 },
632 { 668 {
633 "cmd": [ 669 "cmd": [
634 "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack" , 670 "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack" ,
635 "--arch", 671 "--arch",
636 "arm", 672 "arm",
(...skipping 21 matching lines...) Expand all
658 }, 694 },
659 "name": "stack_tool_for_tombstones" 695 "name": "stack_tool_for_tombstones"
660 }, 696 },
661 { 697 {
662 "cmd": [ 698 "cmd": [
663 "python", 699 "python",
664 "-u", 700 "-u",
665 "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with ope n(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(re port)\n", 701 "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with ope n(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(re port)\n",
666 "[SLAVE_BUILD]/src/out/Release/test_logs/*.log" 702 "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
667 ], 703 ],
704 "env": {
705 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
706 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
707 },
668 "name": "test_report", 708 "name": "test_report",
669 "~followup_annotations": [ 709 "~followup_annotations": [
670 "@@@STEP_LOG_LINE@python.inline@@@@", 710 "@@@STEP_LOG_LINE@python.inline@@@@",
671 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", 711 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
672 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", 712 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
673 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", 713 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@",
674 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", 714 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
675 "@@@STEP_LOG_LINE@python.inline@ print l@@@", 715 "@@@STEP_LOG_LINE@python.inline@ print l@@@",
676 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", 716 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
677 "@@@STEP_LOG_END@python.inline@@@" 717 "@@@STEP_LOG_END@python.inline@@@"
678 ] 718 ]
679 }, 719 },
680 { 720 {
681 "name": "$result", 721 "name": "$result",
682 "reason": "1 tests failed: ['blimp_test_apk']", 722 "reason": "1 tests failed: ['blimp_test_apk']",
683 "status_code": 1 723 "status_code": 1
684 } 724 }
685 ] 725 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698