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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json

Issue 1720873002: swarming: always append task's OS dimension to step name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 10 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/swarming/api.py ('K') | « scripts/slave/recipes/findit/chromium/test.expected/compile_skipped.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json
index d2c919210ade60c46046d607335d642372f14e0f..9f3ae0e3ae73278a8e871f3d3422fa8b847035f9 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json
@@ -3,7 +3,16 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "[BUILD]\\scripts\\slave\\kill_processes.py"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "taskkill"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--master",
"tryserver.chromium.win",
"--builder",
@@ -26,7 +35,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
+ "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
@@ -100,7 +109,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
"--version"
],
"cwd": "[SLAVE_BUILD]",
@@ -114,13 +123,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE[depot_tools]/gclient.py",
+ "RECIPE_PACKAGE[depot_tools]\\gclient.py",
"runhooks"
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -128,7 +137,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -136,9 +145,9 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
+ "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
"--properties",
- "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
@@ -152,25 +161,25 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.win.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"cmd": [
- "git",
+ "[DEPOT_TOOLS]\\git.bat",
"log",
"--format=%H",
"r0..r1"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[SLAVE_BUILD]\\src",
"name": "git commits in range",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -187,7 +196,19 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "[BUILD]\\scripts\\slave\\kill_processes.py"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r1.taskkill",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--master",
"tryserver.chromium.win",
"--builder",
@@ -210,7 +231,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
+ "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
},
"name": "test r1.bot_update",
"~followup_annotations": [
@@ -285,13 +306,13 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE[depot_tools]/gclient.py",
+ "RECIPE_PACKAGE[depot_tools]\\gclient.py",
"runhooks"
],
"cwd": "[SLAVE_BUILD]",
"env": {
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
- "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
},
"name": "test r1.gclient runhooks",
"~followup_annotations": [
@@ -302,7 +323,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -310,9 +331,9 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
+ "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
"--properties",
- "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
+ "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r1.get compile targets for scripts",
@@ -327,14 +348,14 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.win.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r1.read test spec",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Win7 Tests (1)\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -354,7 +375,7 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/cleanup_temp.py"
+ "[BUILD]\\scripts\\slave\\cleanup_temp.py"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r1.cleanup_temp",
@@ -366,11 +387,11 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/compile.py",
+ "[BUILD]\\scripts\\slave\\compile.py",
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[SLAVE_BUILD]\\src",
"--build-tool",
"ninja",
"--compiler",
@@ -378,7 +399,7 @@
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-dir",
- "[BUILD]/goma",
+ "[BUILD]\\goma",
"--ninja-ensure-up-to-date",
"--",
"gl_tests"
@@ -392,17 +413,30 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "[BUILD]\\scripts\\slave\\chromium\\run_crash_handler.py",
+ "--target",
+ "Release"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r1.start_crash_service",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"allow_subannotations": true,
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/infra/scripts/runtest_wrapper.py",
+ "[SLAVE_BUILD]\\src\\infra\\scripts\\runtest_wrapper.py",
"--path-build",
"[BUILD]",
"--",
"--target",
"Release",
- "--xvfb",
"--factory-properties",
"{\"bad_revision\": \"r1\", \"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"good_revision\": \"r0\", \"mastername\": \"tryserver.chromium.win\", \"recipe\": \"findit/chromium/test\", \"slavename\": \"build1-a1\", \"target_mastername\": \"chromium.win\", \"target_testername\": \"Win7 Tests (1)\", \"tests\": {\"gl_tests\": [\"Test.One\", \"Test.Two\", \"Test.Three\"]}, \"use_analyze\": false}",
"--build-properties",
@@ -414,11 +448,11 @@
"/path/to/tmp/json",
"--generate-json-file",
"-o",
- "gtest-results/gl_tests",
+ "gtest-results/gl_tests.exe",
"--builder-name=win_chromium_variable",
"--slave-name=build1-a1",
"--build-number=1",
- "gl_tests",
+ "gl_tests.exe",
"Test.One\nTest.Two\nTest.Three"
],
"cwd": "[SLAVE_BUILD]",
@@ -434,6 +468,20 @@
"cmd": [
"python",
"-u",
+ "[BUILD]\\scripts\\slave\\process_dumps.py",
+ "--target",
+ "Release"
+ ],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "test r1.process_dumps",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"import sys; sys.exit(0)"
],
"cwd": "[SLAVE_BUILD]",
« scripts/slave/recipe_modules/swarming/api.py ('K') | « scripts/slave/recipes/findit/chromium/test.expected/compile_skipped.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/nonexistent_test_step_skipped.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698