| Index: scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_GYP__dbg_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_GYP__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_GYP__dbg_.json
|
| index 2557f5aa3fb342b9259e55f7cf582e252e55daed..f67bf58f21c461cb60ba388e19f495f2ac2daeb1 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_GYP__dbg_.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win8_GYP__dbg_.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]\\Win8_GYP__dbg_",
|
| + "[BUILDER_CACHE]\\win_gyp",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -55,7 +55,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -193,7 +193,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -209,7 +209,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -222,7 +222,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -230,7 +230,7 @@
|
| "Debug",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\Win8_GYP__dbg_\\\\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_gyp\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"Win8 GYP (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -245,12 +245,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\testing\\buildbot\\chromium.win.json",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.win.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_gyp\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"Win8 GYP (dbg)\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -283,7 +283,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\out\\Debug",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\out\\Debug",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "clean isolated files"
|
| @@ -292,14 +292,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.win",
|
| "-b",
|
| "Win8 GYP (dbg)",
|
| "--config-file",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\tools\\mb\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| "--swarming-targets-file",
|
| @@ -330,7 +330,7 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src",
|
| + "[BUILDER_CACHE]\\win_gyp\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -364,9 +364,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\out\\Debug",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\out\\Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src"
|
| + "[BUILDER_CACHE]\\win_gyp\\src"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "remove_build_metadata"
|
| @@ -376,14 +376,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\tools\\swarming_client",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\tools\\swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\out\\Debug\\browser_tests.isolated.gen.json"
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\out\\Debug\\browser_tests.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| @@ -399,11 +399,11 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\Win8_GYP__dbg_\\src\\out\\Debug",
|
| + "[BUILDER_CACHE]\\win_gyp\\src\\out\\Debug",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -424,7 +424,7 @@
|
| "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -444,7 +444,7 @@
|
| "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| "browser_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -465,7 +465,7 @@
|
| "--target",
|
| "Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\Win8_GYP__dbg_",
|
| + "cwd": "[BUILDER_CACHE]\\win_gyp",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|