| Index: scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
|
| diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
|
| index d5e071f58cc3da8206fc93036c99d21e233d23a0..443599cf492ea284b3d1692470bd6d9e44ee2131 100644
|
| --- a/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/tryserver_libyuv_win_clang.json
|
| @@ -11,13 +11,13 @@
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]",
|
| + "cache_dir = '[ROOT]\\\\b\\\\build\\\\slave\\\\cache_dir'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{}",
|
| "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\cache_dir",
|
| "--patch_url",
|
| "try_job_svn_patch",
|
| "--output_json",
|
| @@ -27,7 +27,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -56,10 +55,9 @@
|
| "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": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]\\goma' target_arch=ia32 use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[ROOT]\\b\\build\\goma' target_arch=ia32 use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -71,11 +69,10 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\clang_revision.py",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -102,9 +99,9 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[CWD]\\src",
|
| "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| + "[ROOT]\\b\\build\\slave\\goma_cache",
|
| "--build-tool",
|
| "ninja",
|
| "--compiler",
|
| @@ -114,13 +111,12 @@
|
| "--goma-service-account-json-file",
|
| "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "--goma-dir",
|
| - "[BUILD]\\goma",
|
| + "[ROOT]\\b\\build\\goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| "--",
|
| "All"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -146,7 +142,6 @@
|
| "--slave-name=slavename",
|
| "libyuv_unittest.exe"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "libyuv_unittest"
|
| },
|
| {
|
|
|