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

Side by Side Diff: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_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, 6 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 "name": "extract build" 327 "name": "extract build"
328 }, 328 },
329 { 329 {
330 "cmd": [ 330 "cmd": [
331 "python", 331 "python",
332 "-u", 332 "-u",
333 "RECIPE_MODULE[build::adb]/resources/list_devices.py", 333 "RECIPE_MODULE[build::adb]/resources/list_devices.py",
334 "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'd evices']", 334 "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'd evices']",
335 "/path/to/tmp/json" 335 "/path/to/tmp/json"
336 ], 336 ],
337 "env": {
338 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
339 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
340 },
337 "name": "List adb devices", 341 "name": "List adb devices",
338 "~followup_annotations": [ 342 "~followup_annotations": [
339 "@@@STEP_LOG_LINE@json.output@[@@@", 343 "@@@STEP_LOG_LINE@json.output@[@@@",
340 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@", 344 "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
341 "@@@STEP_LOG_LINE@json.output@]@@@", 345 "@@@STEP_LOG_LINE@json.output@]@@@",
342 "@@@STEP_LOG_END@json.output@@@" 346 "@@@STEP_LOG_END@json.output@@@"
343 ] 347 ]
344 }, 348 },
345 { 349 {
346 "cmd": [ 350 "cmd": [
347 "python", 351 "python",
348 "-u", 352 "-u",
349 "\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", 353 "\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",
350 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 354 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
351 "014E1F310401C009" 355 "014E1F310401C009"
352 ], 356 ],
357 "env": {
358 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
359 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
360 },
353 "name": "Root devices", 361 "name": "Root devices",
354 "~followup_annotations": [ 362 "~followup_annotations": [
355 "@@@STEP_LOG_LINE@python.inline@@@@", 363 "@@@STEP_LOG_LINE@python.inline@@@@",
356 "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", 364 "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
357 "@@@STEP_LOG_LINE@python.inline@import sys@@@", 365 "@@@STEP_LOG_LINE@python.inline@import sys@@@",
358 "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@", 366 "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
359 "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@", 367 "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
360 "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@", 368 "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
361 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'root'])@@@", 369 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'root'])@@@",
362 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'wait-for-device'])@@@", 370 "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', d evice, 'wait-for-device'])@@@",
363 "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (de vice)@@@", 371 "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (de vice)@@@",
364 "@@@STEP_LOG_END@python.inline@@@" 372 "@@@STEP_LOG_END@python.inline@@@"
365 ] 373 ]
366 }, 374 },
367 { 375 {
368 "cmd": [ 376 "cmd": [
369 "python", 377 "python",
370 "-u", 378 "-u",
371 "[SLAVE_BUILD]/src/build/symlink.py", 379 "[SLAVE_BUILD]/src/build/symlink.py",
372 "-f", 380 "-f",
373 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 381 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
374 "~/adb" 382 "~/adb"
375 ], 383 ],
384 "env": {
385 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
386 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
387 },
376 "name": "create adb symlink" 388 "name": "create adb symlink"
377 }, 389 },
378 { 390 {
379 "cmd": [ 391 "cmd": [
380 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 392 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
381 "--", 393 "--",
382 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py", 394 "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
383 "[SLAVE_BUILD]/src/out/logcat" 395 "[SLAVE_BUILD]/src/out/logcat"
384 ], 396 ],
385 "env": { 397 "env": {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 "/tmp/device_monitor.pid", 554 "/tmp/device_monitor.pid",
543 "--", 555 "--",
544 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py" , 556 "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py" ,
545 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb", 557 "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
546 "[\"07a00ca4\"]", 558 "[\"07a00ca4\"]",
547 "chromium.linux", 559 "chromium.linux",
548 "Android Tests", 560 "Android Tests",
549 "--blacklist-file", 561 "--blacklist-file",
550 "[SLAVE_BUILD]/src/out/bad_devices.json" 562 "[SLAVE_BUILD]/src/out/bad_devices.json"
551 ], 563 ],
564 "env": {
565 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
566 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
567 },
552 "name": "spawn_device_monitor" 568 "name": "spawn_device_monitor"
553 }, 569 },
554 { 570 {
555 "cmd": [ 571 "cmd": [
556 "python", 572 "python",
557 "-u", 573 "-u",
558 "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk", 574 "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
559 "--blacklist-file", 575 "--blacklist-file",
560 "[SLAVE_BUILD]/src/out/bad_devices.json", 576 "[SLAVE_BUILD]/src/out/bad_devices.json",
561 "--verbose", 577 "--verbose",
562 "--json-results-file", 578 "--json-results-file",
563 "/path/to/tmp/json" 579 "/path/to/tmp/json"
564 ], 580 ],
581 "env": {
582 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
583 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
584 },
565 "name": "Instrumentation test ChromePublicTest", 585 "name": "Instrumentation test ChromePublicTest",
566 "~followup_annotations": [ 586 "~followup_annotations": [
567 "step returned non-zero exit code: 1", 587 "step returned non-zero exit code: 1",
568 "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@", 588 "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
569 "@@@STEP_FAILURE@@@" 589 "@@@STEP_FAILURE@@@"
570 ] 590 ]
571 }, 591 },
572 { 592 {
573 "cmd": [ 593 "cmd": [
574 "python", 594 "python",
575 "-u", 595 "-u",
576 "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py ", 596 "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py ",
577 "--input-gtest-json", 597 "--input-gtest-json",
578 "{\"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\"}]}]}", 598 "{\"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\"}]}]}",
579 "--master-name", 599 "--master-name",
580 "chromium.linux", 600 "chromium.linux",
581 "--builder-name", 601 "--builder-name",
582 "Android Tests", 602 "Android Tests",
583 "--build-number", 603 "--build-number",
584 "571", 604 "571",
585 "--test-type", 605 "--test-type",
586 "ChromePublicTest", 606 "ChromePublicTest",
587 "--test-results-server", 607 "--test-results-server",
588 "test-results.appspot.com", 608 "test-results.appspot.com",
589 "--chrome-revision", 609 "--chrome-revision",
590 "refs/heads/master@{#170242}" 610 "refs/heads/master@{#170242}"
591 ], 611 ],
612 "env": {
613 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
614 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
615 },
592 "name": "Upload to test-results [ChromePublicTest]" 616 "name": "Upload to test-results [ChromePublicTest]"
593 }, 617 },
594 { 618 {
595 "cmd": [ 619 "cmd": [
596 "python", 620 "python",
597 "-u", 621 "-u",
598 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py", 622 "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
599 "--action", 623 "--action",
600 "stop", 624 "stop",
601 "--pid-file-path", 625 "--pid-file-path",
602 "/tmp/device_monitor.pid" 626 "/tmp/device_monitor.pid"
603 ], 627 ],
628 "env": {
629 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
630 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
631 },
604 "name": "shutdown_device_monitor" 632 "name": "shutdown_device_monitor"
605 }, 633 },
606 { 634 {
607 "cmd": [ 635 "cmd": [
608 "python", 636 "python",
609 "-u", 637 "-u",
610 "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py", 638 "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
611 "--output-path", 639 "--output-path",
612 "[SLAVE_BUILD]/src/out/Release/full_log", 640 "[SLAVE_BUILD]/src/out/Release/full_log",
613 "[SLAVE_BUILD]/src/out/logcat" 641 "[SLAVE_BUILD]/src/out/logcat"
614 ], 642 ],
643 "env": {
644 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
645 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
646 },
615 "name": "logcat_dump" 647 "name": "logcat_dump"
616 }, 648 },
617 { 649 {
618 "cmd": [ 650 "cmd": [
619 "python", 651 "python",
620 "-u", 652 "-u",
621 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py", 653 "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
622 "--", 654 "--",
623 "[DEPOT_TOOLS]/gsutil.py", 655 "[DEPOT_TOOLS]/gsutil.py",
624 "--force-version", 656 "--force-version",
625 "4.7", 657 "4.7",
626 "-o", 658 "-o",
627 "GSUtil:parallel_composite_upload_threshold=50M", 659 "GSUtil:parallel_composite_upload_threshold=50M",
628 "----", 660 "----",
629 "cp", 661 "cp",
630 "[SLAVE_BUILD]/src/out/Release/full_log", 662 "[SLAVE_BUILD]/src/out/Release/full_log",
631 "gs://chromium-android/logcat_dumps/Android Tests/571" 663 "gs://chromium-android/logcat_dumps/Android Tests/571"
632 ], 664 ],
665 "env": {
666 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
667 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
668 },
633 "name": "gsutil upload", 669 "name": "gsutil upload",
634 "~followup_annotations": [ 670 "~followup_annotations": [
635 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi d/logcat_dumps/Android Tests/571@@@" 671 "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-androi d/logcat_dumps/Android Tests/571@@@"
636 ] 672 ]
637 }, 673 },
638 { 674 {
639 "cmd": [ 675 "cmd": [
640 "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack" , 676 "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack" ,
641 "--arch", 677 "--arch",
642 "arm", 678 "arm",
(...skipping 21 matching lines...) Expand all
664 }, 700 },
665 "name": "stack_tool_for_tombstones" 701 "name": "stack_tool_for_tombstones"
666 }, 702 },
667 { 703 {
668 "cmd": [ 704 "cmd": [
669 "python", 705 "python",
670 "-u", 706 "-u",
671 "\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", 707 "\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",
672 "[SLAVE_BUILD]/src/out/Release/test_logs/*.log" 708 "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
673 ], 709 ],
710 "env": {
711 "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account -goma-client.json",
712 "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[S LAVE_BUILD]/src/build/android:%(PATH)s"
713 },
674 "name": "test_report", 714 "name": "test_report",
675 "~followup_annotations": [ 715 "~followup_annotations": [
676 "@@@STEP_LOG_LINE@python.inline@@@@", 716 "@@@STEP_LOG_LINE@python.inline@@@@",
677 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@", 717 "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
678 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@", 718 "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
679 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@", 719 "@@@STEP_LOG_LINE@python.inline@ with open(report, 'r') as f:@@@",
680 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@", 720 "@@@STEP_LOG_LINE@python.inline@ for l in f.readlines():@@@",
681 "@@@STEP_LOG_LINE@python.inline@ print l@@@", 721 "@@@STEP_LOG_LINE@python.inline@ print l@@@",
682 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@", 722 "@@@STEP_LOG_LINE@python.inline@ os.remove(report)@@@",
683 "@@@STEP_LOG_END@python.inline@@@" 723 "@@@STEP_LOG_END@python.inline@@@"
684 ] 724 ]
685 }, 725 },
686 { 726 {
687 "name": "$result", 727 "name": "$result",
688 "reason": "1 tests failed: ['ChromePublicTest']", 728 "reason": "1 tests failed: ['ChromePublicTest']",
689 "status_code": 1 729 "status_code": 1
690 } 730 }
691 ] 731 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698