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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/dynamic_gtest_with_args_on_trybot.json

Issue 1588793002: Support variable substitution and tryserver- and waterfall-only cmd line args. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Addressed review feedback. Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/dynamic_gtest_with_args_on_trybot.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_gtest_with_args_on_trybot.json
similarity index 95%
copy from scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json
copy to scripts/slave/recipes/chromium_trybot.expected/dynamic_gtest_with_args_on_trybot.json
index e662e0e4c52b1203a6276b280fbe05a3320b208a..32de98081adc42c963177a24d8ebb793169fbc8a 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarming_trigger_failure.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_gtest_with_args_on_trybot.json
@@ -138,9 +138,17 @@
"@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--correct-common-arg\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"non_precommit_args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--SHOULD-NOT-BE-PRESENT-DURING-THE-RUN\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"precommit_args\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--these-args-should-be-present\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--test-machine-name=\\\"${buildername}\\\"\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"--build-revision=\\\"${got_revision}\\\"\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ ], @@@",
"@@@STEP_LOG_LINE@json.output@ \"test\": \"base_unittests\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
@@ -240,7 +248,6 @@
"@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
@@ -251,7 +258,6 @@
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
@@ -262,7 +268,6 @@
"@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
@@ -272,7 +277,6 @@
"@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
"@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
- "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
"@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
@@ -319,7 +323,7 @@
"--goma-dir",
"[BUILD]/goma",
"--swarming-targets-file",
- "base_unittests\ncontent_gl_tests\ngl_tests\nangle_unittests\ngl_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\nbase_unittests\n",
+ "content_gl_tests\ngl_tests\nangle_unittests\ngl_unittests\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntelemetry_gpu_test\ntab_capture_end2end_tests\n",
"//out/Release"
],
"cwd": "[SLAVE_BUILD]",
@@ -348,7 +352,6 @@
"--",
"angle_unittests_run",
"base_unittests",
- "base_unittests_run",
"chromium_swarm_tests",
"content_gl_tests_run",
"gl_tests_run",
@@ -391,7 +394,6 @@
"[SLAVE_BUILD]/src/out/Release/content_gl_tests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/gl_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/tab_capture_end2end_tests.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/base_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/angle_unittests.isolated.gen.json",
"[SLAVE_BUILD]/src/out/Release/telemetry_gpu_test.isolated.gen.json"
@@ -401,7 +403,6 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"base_unittests\": \"[dummy hash for base_unittests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"gl_unittests\": \"[dummy hash for gl_unittests]\", @@@",
@@ -415,23 +416,6 @@
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
- "base_unittests"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "[error] base_unittests (with patch)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
"[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
@@ -1810,21 +1794,40 @@
]
},
{
+ "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
- "base_unittests"
+ "[SLAVE_BUILD]/src/infra/scripts/runtest_wrapper.py",
+ "--path-build",
+ "[BUILD]",
+ "--",
+ "--target",
+ "Release",
+ "--xvfb",
+ "--factory-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"angle_unittests\": \"[dummy hash for angle_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--build-properties",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"angle_unittests\": \"[dummy hash for angle_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "--annotate=gtest",
+ "--test-type=base_unittests",
+ "--step-name=base_unittests (with patch)",
+ "--test-launcher-summary-output",
+ "/path/to/tmp/json",
+ "--generate-json-file",
+ "-o",
+ "gtest-results/base_unittests",
+ "--builder-name=linux_chromium_rel_ng",
+ "--slave-name=TestSlavename",
+ "--build-number=571",
+ "base_unittests",
+ "--correct-common-arg",
+ "--these-args-should-be-present",
+ "--test-machine-name=\"linux_chromium_rel_ng\"",
+ "--build-revision=\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\""
],
"cwd": "[SLAVE_BUILD]",
- "name": "[collect error] base_unittests (with patch)",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
+ "name": "base_unittests (with patch)"
},
{
"allow_subannotations": true,
@@ -2324,29 +2327,11 @@
"170242"
],
"cwd": "[SLAVE_BUILD]",
- "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]",
- "~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@failure_type@\"INVALID_TEST_RESULTS\"@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import sys; sys.exit(1)"
- ],
- "cwd": "[SLAVE_BUILD]",
- "name": "base_unittests",
- "~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@TEST RESULTS WERE INVALID@@@",
- "@@@STEP_FAILURE@@@",
- "@@@SET_BUILD_PROPERTY@failure_hash@\"212d0eb2385b1eaa828053689225258ece065725\"@@@"
- ]
+ "name": "Upload to test-results [tab_capture_end2end_tests on NVIDIA GPU on Linux (with patch) on Linux]"
},
{
"name": "$result",
- "reason": "1 out of 1 aggregated steps failed. Failures: Step('base_unittests') failed with return_code 1",
- "status_code": 1
+ "recipe_result": null,
+ "status_code": 0
}
]
« scripts/slave/recipe_modules/chromium_tests/steps.py ('K') | « scripts/slave/recipes/chromium_trybot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698