| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gyp_dbg.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gn_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gyp_dbg.json
|
| similarity index 94%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gn_dbg.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gyp_dbg.json
|
| index ea351cee367b6376cf9d10a89275e846d8fb29d8..62a74897d0548a472bd55d518e58f56f75ec407d 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gn_dbg.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_mac_gyp_dbg.json
|
| @@ -26,7 +26,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/mac_gn_dbg",
|
| + "[BUILDER_CACHE]/mac_gyp_dbg",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -51,7 +51,7 @@
|
| "--master",
|
| "tryserver.webrtc",
|
| "--builder",
|
| - "mac_gn_dbg",
|
| + "mac_gyp_dbg",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -74,7 +74,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/mac_gn_dbg",
|
| + "cwd": "[BUILDER_CACHE]/mac_gyp_dbg",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -111,7 +111,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
|
| - "[BUILDER_CACHE]/mac_gn_dbg/src/out"
|
| + "[BUILDER_CACHE]/mac_gyp_dbg/src/out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -191,7 +191,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/mac_gn_dbg/src",
|
| + "cwd": "[BUILDER_CACHE]/mac_gyp_dbg/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -204,20 +204,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/mac_gn_dbg/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/mac_gyp_dbg/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.webrtc",
|
| "-b",
|
| - "mac_gn_dbg",
|
| + "mac_gyp_dbg",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/mac_gn_dbg/src/webrtc/build/mb_config.pyl",
|
| + "[BUILDER_CACHE]/mac_gyp_dbg/src/webrtc/build/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--gyp-script=[BUILDER_CACHE]/mac_gn_dbg/src/webrtc/build/gyp_webrtc.py",
|
| + "--gyp-script=[BUILDER_CACHE]/mac_gyp_dbg/src/webrtc/build/gyp_webrtc.py",
|
| "//out/Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/mac_gn_dbg/src",
|
| + "cwd": "[BUILDER_CACHE]/mac_gyp_dbg/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -230,7 +230,7 @@
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/mac_gn_dbg/src",
|
| + "[BUILDER_CACHE]/mac_gyp_dbg/src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| @@ -260,7 +260,7 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/mac_gn_dbg/src",
|
| + "[BUILDER_CACHE]/mac_gyp_dbg/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -275,8 +275,7 @@
|
| "[CACHE]/cipd/goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
|
|