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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2223353004: findit: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.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 117c6c280f95ee7981986f38294e3ad8a89cff6d..0d72dd267376f8744d7107812735a24d2f727cd0 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
@@ -11,6 +11,28 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]\\win",
+ "511"
+ ],
+ "name": "makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--master",
"tryserver.chromium.win",
@@ -32,6 +54,7 @@
"src@r1",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]\\win",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -169,7 +192,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
+ "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client\\swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -185,7 +208,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]\\src",
+ "cwd": "[BUILDER_CACHE]\\win\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
@@ -198,7 +221,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -206,7 +229,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
"{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
],
@@ -221,12 +244,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
+ "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.win.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -246,7 +269,7 @@
"--format=%H",
"r0..r1"
],
- "cwd": "[SLAVE_BUILD]\\src",
+ "cwd": "[BUILDER_CACHE]\\win\\src",
"name": "git commits in range",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -273,6 +296,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]\\win",
+ "511"
+ ],
+ "name": "test r1.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
"--master",
"tryserver.chromium.win",
@@ -294,6 +340,7 @@
"src@r1",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]\\win",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -438,7 +485,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]\\src",
+ "cwd": "[BUILDER_CACHE]\\win\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
@@ -454,7 +501,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
+ "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -462,7 +509,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]\\\\win\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
"{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
],
@@ -478,13 +525,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
+ "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
"name": "test r1.read test spec (chromium.win.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\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\": [@@@",
@@ -518,19 +565,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
+ "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
"gen",
"-m",
"chromium.win",
"-b",
"Win Builder",
"--config-file",
- "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
+ "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb_config.pyl",
"--goma-dir",
"[CACHE]\\cipd\\goma",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]\\src",
+ "cwd": "[BUILDER_CACHE]\\win\\src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -554,9 +601,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]\\src",
+ "[BUILDER_CACHE]\\win\\src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma",
"--goma-jsonstatus",
@@ -584,14 +633,14 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\infra\\scripts\\runtest_wrapper.py",
+ "[BUILDER_CACHE]\\win\\src\\infra\\scripts\\runtest_wrapper.py",
"--",
"--target",
"Release",
"--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}",
+ "{\"bad_revision\": \"r1\", \"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"good_revision\": \"r0\", \"mastername\": \"tryserver.chromium.win\", \"path_config\": \"kitchen\", \"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",
- "{\"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}",
+ "{\"bad_revision\": \"r1\", \"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"good_revision\": \"r0\", \"mastername\": \"tryserver.chromium.win\", \"path_config\": \"kitchen\", \"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}",
"--annotate=gtest",
"--test-type=gl_tests",
"--step-name=gl_tests (r1)",
@@ -606,6 +655,7 @@
"gl_tests.exe",
"Test.One\nTest.Two\nTest.Three"
],
+ "cwd": "[BUILDER_CACHE]\\win",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -625,6 +675,7 @@
"--target",
"Release"
],
+ "cwd": "[BUILDER_CACHE]\\win",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.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