| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gyp_rel.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gyp_rel.json
|
| similarity index 93%
|
| rename from scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_rel.json
|
| rename to scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gyp_rel.json
|
| index 751fc92eab22e8a4823a11cb9367913233cc4b17..c51c221220376cf2ab30d30bdd60a6291b62aa95 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gn_rel.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_win_x64_gyp_rel.json
|
| @@ -4,7 +4,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]\\win_x64_gn_rel",
|
| + "[BUILDER_CACHE]\\win_x64_gyp_rel",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -29,7 +29,7 @@
|
| "--master",
|
| "tryserver.webrtc",
|
| "--builder",
|
| - "win_x64_gn_rel",
|
| + "win_x64_gyp_rel",
|
| "--slave",
|
| "slavename",
|
| "--spec",
|
| @@ -52,7 +52,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win_x64_gn_rel",
|
| + "cwd": "[BUILDER_CACHE]\\win_x64_gyp_rel",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -89,7 +89,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]\\resources\\cleanup_files.py",
|
| - "[BUILDER_CACHE]\\win_x64_gn_rel\\src\\out"
|
| + "[BUILDER_CACHE]\\win_x64_gyp_rel\\src\\out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -169,7 +169,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win_x64_gn_rel\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win_x64_gyp_rel\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -182,20 +182,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win_x64_gn_rel\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win_x64_gyp_rel\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.webrtc",
|
| "-b",
|
| - "win_x64_gn_rel",
|
| + "win_x64_gyp_rel",
|
| "--config-file",
|
| - "[BUILDER_CACHE]\\win_x64_gn_rel\\src\\webrtc\\build\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\win_x64_gyp_rel\\src\\webrtc\\build\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| - "--gyp-script=[BUILDER_CACHE]\\win_x64_gn_rel\\src\\webrtc\\build\\gyp_webrtc.py",
|
| + "--gyp-script=[BUILDER_CACHE]\\win_x64_gyp_rel\\src\\webrtc\\build\\gyp_webrtc.py",
|
| "//out/Release_x64"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win_x64_gn_rel\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win_x64_gyp_rel\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -216,7 +216,7 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\win_x64_gn_rel\\src",
|
| + "[BUILDER_CACHE]\\win_x64_gyp_rel\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -231,8 +231,7 @@
|
| "[CACHE]\\cipd\\goma",
|
| "--goma-fail-fast",
|
| "--goma-disable-local-fallback",
|
| - "--",
|
| - "all"
|
| + "--"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
|
|