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

Unified Diff: scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Coverage.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 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
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 d64312fd1bc01b9d8bc7fa0da00cd529e5229f08..a52b70b3ad85d6e583be173d0635268196fffa0d 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,7 +5,6 @@
"-u",
"print \"dummy taskkill\""
],
- "cwd": "[SLAVE_BUILD]",
"name": "taskkill",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@print \"dummy taskkill\"@@@",
@@ -24,13 +23,13 @@
"--slave",
"fake_slave",
"--spec",
- "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'}]",
+ "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'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]\\b\\build\\slave\\cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -38,7 +37,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -78,7 +76,6 @@
"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",
@@ -102,16 +99,15 @@
"--target",
"Coverage",
"--src-dir",
- "[SLAVE_BUILD]\\src",
+ "[CWD]\\src",
"--goma-cache-dir",
- "[GOMA_CACHE]",
+ "[ROOT]\\b\\build\\slave\\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"
},
@@ -123,10 +119,9 @@
"-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",
- "[SLAVE_BUILD]\\src\\out\\Coverage"
+ "[CWD]\\src\\out\\Coverage"
],
- "cwd": "[SLAVE_BUILD]",
- "name": "rmwildcard metrics.csv in [SLAVE_BUILD]\\src\\out\\Coverage",
+ "name": "rmwildcard metrics.csv in [CWD]\\src\\out\\Coverage",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
@@ -141,10 +136,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\src\\syzygy\\unittests.gypi",
+ "[CWD]\\src\\syzygy\\unittests.gypi",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read_unittests_gypi"
},
{
@@ -163,12 +157,11 @@
"--builder-name=Syzygy Coverage",
"--slave-name=fake_slave",
"--build-number=571",
- "[SLAVE_BUILD]\\src\\out\\Coverage\\bar_unittests.exe",
+ "[CWD]\\src\\out\\Coverage\\bar_unittests.exe",
"--single-process-tests",
"--test-launcher-timeout=300000",
"--gtest_print_time"
],
- "cwd": "[SLAVE_BUILD]",
"name": "bar_unittests"
},
{
@@ -187,12 +180,11 @@
"--builder-name=Syzygy Coverage",
"--slave-name=fake_slave",
"--build-number=571",
- "[SLAVE_BUILD]\\src\\out\\Coverage\\baz_unittests.exe",
+ "[CWD]\\src\\out\\Coverage\\baz_unittests.exe",
"--single-process-tests",
"--test-launcher-timeout=300000",
"--gtest_print_time"
],
- "cwd": "[SLAVE_BUILD]",
"name": "baz_unittests"
},
{
@@ -211,40 +203,37 @@
"--builder-name=Syzygy Coverage",
"--slave-name=fake_slave",
"--build-number=571",
- "[SLAVE_BUILD]\\src\\out\\Coverage\\foo_unittests.exe",
+ "[CWD]\\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",
- "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\randomize_chrome.py",
+ "[CWD]\\src\\syzygy\\internal\\build\\randomize_chrome.py",
"--build-dir",
- "[SLAVE_BUILD]\\src\\out",
+ "[CWD]\\src\\out",
"--target",
"Coverage",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "randomly_reorder_chrome"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py",
+ "[CWD]\\src\\syzygy\\internal\\build\\benchmark_chrome.py",
"--build-dir",
- "[SLAVE_BUILD]\\src\\out",
+ "[CWD]\\src\\out",
"--target",
"Coverage",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "benchmark_chrome"
},
{
@@ -254,10 +243,9 @@
"-t",
"-a",
"public-read",
- "[SLAVE_BUILD]\\src\\out\\Coverage\\metrics.csv",
+ "[CWD]\\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/@@@"
@@ -267,13 +255,12 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\syzygy\\build\\generate_coverage.py",
+ "[CWD]\\src\\syzygy\\build\\generate_coverage.py",
"--verbose",
"--syzygy",
"--build-dir",
- "[SLAVE_BUILD]\\src\\out\\Coverage"
+ "[CWD]\\src\\out\\Coverage"
],
- "cwd": "[SLAVE_BUILD]",
"name": "capture_unittest_coverage"
},
{
@@ -282,10 +269,9 @@
"-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\syzygy\\gsutil_cp_dir.py",
"--public-read",
- "[SLAVE_BUILD]\\src\\out\\Coverage\\cov",
+ "[CWD]\\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@@@"
@@ -295,27 +281,25 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\syzygy\\build\\get_syzygy_binaries.py",
+ "[CWD]\\src\\syzygy\\build\\get_syzygy_binaries.py",
"--output-dir",
- "[SLAVE_BUILD]\\src\\syzygy\\binaries",
+ "[CWD]\\src\\syzygy\\binaries",
"--revision",
"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--overwrite",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download_binaries"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\syzygy\\internal\\build\\smoke_test.py",
+ "[CWD]\\src\\syzygy\\internal\\build\\smoke_test.py",
"--verbose",
"--build-dir",
- "[SLAVE_BUILD]\\src\\build"
+ "[CWD]\\src\\build"
],
- "cwd": "[SLAVE_BUILD]",
"name": "smoke_test"
},
{

Powered by Google App Engine
This is Rietveld 408576698