| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng_exp.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng_exp.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng_exp.json
|
| index 1b376972e7d1d5152824ef8973f89cb349ca6d7e..b9e30d2a422a91213ad1caa46b6e9b0b6321f5b4 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng_exp.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_win_win10_chromium_x64_rel_ng_exp.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]\\win10_chromium_x64_rel_ng_exp",
|
| + "[BUILDER_CACHE]\\win",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -60,7 +60,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp",
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -198,7 +198,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -214,7 +214,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -227,7 +227,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -235,7 +235,7 @@
|
| "Release_x64",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]\\\\win10_chromium_x64_rel_ng_exp\\\\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\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win10_chromium_x64_rel_ng_exp\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -250,12 +250,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\testing\\buildbot\\chromium.win.json",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.win.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -274,7 +274,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win\\src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -288,7 +288,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
| @@ -351,14 +351,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.chromium.win",
|
| "-b",
|
| "win10_chromium_x64_rel_ng_exp",
|
| "--config-file",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\tools\\mb\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| "//out/Release_x64"
|
| @@ -383,7 +383,7 @@
|
| "--target",
|
| "Release_x64",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src",
|
| + "[BUILDER_CACHE]\\win\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -423,18 +423,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\chrome\\test\\mini_installer\\test_installer.py",
|
| + "[BUILDER_CACHE]\\win\\src\\chrome\\test\\mini_installer\\test_installer.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\out",
|
| + "[BUILDER_CACHE]\\win\\src\\out",
|
| "--target",
|
| "Release_x64",
|
| "--force-clean",
|
| "--config",
|
| - "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp\\src\\chrome\\test\\mini_installer\\config\\config.config",
|
| + "[BUILDER_CACHE]\\win\\src\\chrome\\test\\mini_installer\\config\\config.config",
|
| "--write-full-results-to",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp",
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -448,7 +448,7 @@
|
| "--target",
|
| "Release_x64"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win10_chromium_x64_rel_ng_exp",
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|