| Index: scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Official.json
|
| diff --git a/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Official.json b/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Official.json
|
| index 122e8208919fafdf21dc4a90775a4e127c69a085..4f7a6e959baafaec71fe0e44c7d9e2ac96bb703c 100644
|
| --- a/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Official.json
|
| +++ b/scripts/slave/recipe_modules/syzygy/example.expected/full_master_client_syzygy_Syzygy_Official.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": "official_build=1 target_arch=ia32",
|
| @@ -102,9 +99,9 @@
|
| "--target",
|
| "Release",
|
| "--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",
|
| @@ -112,7 +109,6 @@
|
| "--",
|
| "official_build"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -124,10 +120,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\\Release"
|
| + "[CWD]\\src\\out\\Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "rmwildcard metrics.csv in [SLAVE_BUILD]\\src\\out\\Release",
|
| + "name": "rmwildcard metrics.csv in [CWD]\\src\\out\\Release",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| @@ -142,10 +137,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"
|
| },
|
| {
|
| @@ -164,12 +158,11 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=fake_slave",
|
| "--build-number=571",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\bar_unittests.exe",
|
| + "[CWD]\\src\\out\\Release\\bar_unittests.exe",
|
| "--single-process-tests",
|
| "--test-launcher-timeout=300000",
|
| "--gtest_print_time"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "bar_unittests"
|
| },
|
| {
|
| @@ -188,12 +181,11 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=fake_slave",
|
| "--build-number=571",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\baz_unittests.exe",
|
| + "[CWD]\\src\\out\\Release\\baz_unittests.exe",
|
| "--single-process-tests",
|
| "--test-launcher-timeout=300000",
|
| "--gtest_print_time"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "baz_unittests"
|
| },
|
| {
|
| @@ -212,40 +204,37 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=fake_slave",
|
| "--build-number=571",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\foo_unittests.exe",
|
| + "[CWD]\\src\\out\\Release\\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",
|
| "Release",
|
| "--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",
|
| "Release",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "benchmark_chrome"
|
| },
|
| {
|
| @@ -255,10 +244,9 @@
|
| "-t",
|
| "-a",
|
| "public-read",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\metrics.csv",
|
| + "[CWD]\\src\\out\\Release\\metrics.csv",
|
| "gs://syzygy-archive/builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "archive_metrics",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=builds/metrics/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/official.csv/@@@"
|
| @@ -269,10 +257,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\syzygy\\SYZYGY_VERSION",
|
| + "[CWD]\\src\\syzygy\\SYZYGY_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read_version"
|
| },
|
| {
|
| @@ -281,10 +268,9 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\syzygy\\gsutil_cp_dir.py",
|
| "--public-read",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\archive",
|
| + "[CWD]\\src\\out\\Release\\archive",
|
| "gs://syzygy-archive/test/builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "archive_binaries",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@0.0.0.1 archive@https://syzygy-archive.commondatastorage.googleapis.com/index.html?path=test/builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/@@@"
|
| @@ -294,40 +280,37 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
|
| + "[CWD]\\src\\syzygy\\internal\\scripts\\archive_symbols.py",
|
| "-s",
|
| "-b",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\*asan_rtl.dll",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\*client.dll"
|
| + "[CWD]\\src\\out\\Release\\*asan_rtl.dll",
|
| + "[CWD]\\src\\out\\Release\\*client.dll"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "upload_symbols"
|
| },
|
| {
|
| "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"
|
| },
|
| {
|
|
|