| Index: scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json
|
| diff --git a/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json b/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json
|
| index 96aad87933c612bb4d6c91fb6a3ce45eeddf95c2..ce38c253870d04996f51ca205058ca088bc24315 100644
|
| --- a/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json
|
| +++ b/scripts/slave/recipes/syzygy/continuous.expected/full_master_client_syzygy_Syzygy_Official.json
|
| @@ -5,7 +5,6 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "taskkill"
|
| },
|
| {
|
| @@ -20,13 +19,13 @@
|
| "--slave",
|
| "vm331-m3",
|
| "--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",
|
| @@ -34,7 +33,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -74,7 +72,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",
|
| @@ -98,9 +95,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",
|
| @@ -108,7 +105,6 @@
|
| "--",
|
| "official_build"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -120,10 +116,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@@@",
|
| @@ -138,10 +133,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"
|
| },
|
| {
|
| @@ -160,12 +154,11 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=vm331-m3",
|
| "--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"
|
| },
|
| {
|
| @@ -184,12 +177,11 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=vm331-m3",
|
| "--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"
|
| },
|
| {
|
| @@ -208,12 +200,11 @@
|
| "--builder-name=Syzygy Official",
|
| "--slave-name=vm331-m3",
|
| "--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"
|
| },
|
| {
|
| @@ -223,10 +214,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/@@@"
|
| @@ -236,28 +226,26 @@
|
| "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"
|
| },
|
| {
|
| @@ -265,10 +253,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"
|
| },
|
| {
|
| @@ -277,10 +264,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/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=builds/official/f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9/@@@"
|
| @@ -290,18 +276,16 @@
|
| "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": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "trigger",
|
| "trigger_specs": [
|
| {
|
|
|