Index: scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json |
diff --git a/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json b/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json |
index a52b70b3ad85d6e583be173d0635268196fffa0d..d64312fd1bc01b9d8bc7fa0da00cd529e5229f08 100644 |
--- a/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json |
+++ b/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json |
@@ -5,6 +5,7 @@ |
"-u", |
"print \"dummy taskkill\"" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "taskkill", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@print \"dummy taskkill\"@@@", |
@@ -23,13 +24,13 @@ |
"--slave", |
"fake_slave", |
"--spec", |
- "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]", |
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/github.com/google/syzygy.git/'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/syzygy/internal.DEPS.git'}]", |
"--root", |
"src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\"}", |
"--git-cache-dir", |
- "[ROOT]\\b\\build\\slave\\cache_dir", |
+ "[GIT_CACHE]", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -37,6 +38,7 @@ |
"--force", |
"--output_manifest" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
@@ -76,6 +78,7 @@ |
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py", |
"runhooks" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json", |
"GYP_DEFINES": "target_arch=ia32", |
@@ -99,15 +102,16 @@ |
"--target", |
"Coverage", |
"--src-dir", |
- "[CWD]\\src", |
+ "[SLAVE_BUILD]\\src", |
"--goma-cache-dir", |
- "[ROOT]\\b\\build\\slave\\goma_cache", |
+ "[GOMA_CACHE]", |
"--build-tool", |
"ninja", |
"--ninja-ensure-up-to-date", |
"--", |
"build_all" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json" |
}, |
@@ -119,9 +123,10 @@ |
"-u", |
"\nimport sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\nchromium_utils.RemoveFilesWildcards(sys.argv[1], root=sys.argv[2])\n", |
"metrics.csv", |
- "[CWD]\\src\\out\\Coverage" |
+ "[SLAVE_BUILD]\\src\\out\\Coverage" |
], |
- "name": "rmwildcard metrics.csv in [CWD]\\src\\out\\Coverage", |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "rmwildcard metrics.csv in [SLAVE_BUILD]\\src\\out\\Coverage", |
"~followup_annotations": [ |
"@@@STEP_LOG_LINE@python.inline@@@@", |
"@@@STEP_LOG_LINE@python.inline@import sys@@@", |
@@ -136,9 +141,10 @@ |
"python", |
"-u", |
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
- "[CWD]\\src\\syzygy\\unittests.gypi", |
+ "[SLAVE_BUILD]\\src\\syzygy\\unittests.gypi", |
"/path/to/tmp/" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "read_unittests_gypi" |
}, |
{ |
@@ -157,11 +163,12 @@ |
"--builder-name=Syzygy Coverage", |
"--slave-name=fake_slave", |
"--build-number=571", |
- "[CWD]\\src\\out\\Coverage\\bar_unittests.exe", |
+ "[SLAVE_BUILD]\\src\\out\\Coverage\\bar_unittests.exe", |
"--single-process-tests", |
"--test-launcher-timeout=300000", |
"--gtest_print_time" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "bar_unittests" |
}, |
{ |
@@ -180,11 +187,12 @@ |
"--builder-name=Syzygy Coverage", |
"--slave-name=fake_slave", |
"--build-number=571", |
- "[CWD]\\src\\out\\Coverage\\baz_unittests.exe", |
+ "[SLAVE_BUILD]\\src\\out\\Coverage\\baz_unittests.exe", |
"--single-process-tests", |
"--test-launcher-timeout=300000", |
"--gtest_print_time" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "baz_unittests" |
}, |
{ |
@@ -203,37 +211,40 @@ |
"--builder-name=Syzygy Coverage", |
"--slave-name=fake_slave", |
"--build-number=571", |
- "[CWD]\\src\\out\\Coverage\\foo_unittests.exe", |
+ "[SLAVE_BUILD]\\src\\out\\Coverage\\foo_unittests.exe", |
"--single-process-tests", |
"--test-launcher-timeout=300000", |
"--gtest_print_time" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "foo_unittests" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\internal\\build\\randomize_chrome.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\randomize_chrome.py", |
"--build-dir", |
- "[CWD]\\src\\out", |
+ "[SLAVE_BUILD]\\src\\out", |
"--target", |
"Coverage", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "randomly_reorder_chrome" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py", |
"--build-dir", |
- "[CWD]\\src\\out", |
+ "[SLAVE_BUILD]\\src\\out", |
"--target", |
"Coverage", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "benchmark_chrome" |
}, |
{ |
@@ -243,9 +254,10 @@ |
"-t", |
"-a", |
"public-read", |
- "[CWD]\\src\\out\\Coverage\\metrics.csv", |
+ "[SLAVE_BUILD]\\src\\out\\Coverage\\metrics.csv", |
"gs://syzygy-archive/builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/coverage.csv" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive_metrics", |
"~followup_annotations": [ |
"@@@STEP_LINK@archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/coverage.csv/@@@" |
@@ -255,12 +267,13 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\build\\generate_coverage.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\build\\generate_coverage.py", |
"--verbose", |
"--syzygy", |
"--build-dir", |
- "[CWD]\\src\\out\\Coverage" |
+ "[SLAVE_BUILD]\\src\\out\\Coverage" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "capture_unittest_coverage" |
}, |
{ |
@@ -269,9 +282,10 @@ |
"-u", |
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\syzygy\\gsutil_cp_dir.py", |
"--public-read", |
- "[CWD]\\src\\out\\Coverage\\cov", |
+ "[SLAVE_BUILD]\\src\\out\\Coverage\\cov", |
"gs://syzygy-archive/test/builds/coverage/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "archive_coverage", |
"~followup_annotations": [ |
"@@@STEP_LINK@coverage_report@https://syzygy-archive.commondatastorage.googleapis.com/test/builds/coverage/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/index.html@@@" |
@@ -281,25 +295,27 @@ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\build\\get_syzygy_binaries.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\build\\get_syzygy_binaries.py", |
"--output-dir", |
- "[CWD]\\src\\syzygy\\binaries", |
+ "[SLAVE_BUILD]\\src\\syzygy\\binaries", |
"--revision", |
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", |
"--overwrite", |
"--verbose" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "download_binaries" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[CWD]\\src\\syzygy\\internal\\build\\smoke_test.py", |
+ "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\smoke_test.py", |
"--verbose", |
"--build-dir", |
- "[CWD]\\src\\build" |
+ "[SLAVE_BUILD]\\src\\build" |
], |
+ "cwd": "[SLAVE_BUILD]", |
"name": "smoke_test" |
}, |
{ |