| Index: scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
|
| index ee67197915af3439f4770040b2ae707004abd892..f580aa11d1b4845723ef41e1a8e29305752ce685 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_Win_x64.json
|
| @@ -12,7 +12,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_archive",
|
| + "[BUILDER_CACHE]\\Win_x64",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -55,7 +55,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win_x64_archive",
|
| + "cwd": "[BUILDER_CACHE]\\Win_x64",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -194,7 +194,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[BUILDER_CACHE]\\win_x64_archive\\src\\out\\Release_x64"
|
| + "[BUILDER_CACHE]\\Win_x64\\src\\out\\Release_x64"
|
| ],
|
| "name": "rmtree clobber",
|
| "~followup_annotations": [
|
| @@ -215,7 +215,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win_x64_archive\\src",
|
| + "cwd": "[BUILDER_CACHE]\\Win_x64\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_DEFINES": "component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
|
| @@ -227,14 +227,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win_x64_archive\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\Win_x64\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release_x64",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\win_x64_archive\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\Win_x64\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"Win x64\", \"buildnumber\": 571, \"mastername\": \"chromium\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -249,12 +249,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win_x64_archive\\src\\testing\\buildbot\\chromium.json",
|
| + "[BUILDER_CACHE]\\Win_x64\\src\\testing\\buildbot\\chromium.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_x64_archive\\src\\testing\\buildbot\\chromium.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win_x64\\src\\testing\\buildbot\\chromium.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -285,7 +285,7 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\win_x64_archive\\src",
|
| + "[BUILDER_CACHE]\\Win_x64\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
|
|