| Index: scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json
|
| index 9a5877b6e7a6e91dce29984ab44bda06f79b5f0b..ede0b471e5b0049a662c75d7dfe9c12d4e3451a5 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_chromium_trybot.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",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -62,7 +62,7 @@
|
| "src/v8@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -201,7 +201,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -217,7 +217,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -230,7 +230,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -238,7 +238,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"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\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -253,12 +253,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.gpu.json",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.gpu.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.gpu.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.gpu.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.gpu.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -268,12 +268,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.win.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -292,7 +292,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win\\src\\v8",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\v8",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -306,7 +306,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read filter exclusion spec",
|
| @@ -330,7 +330,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb.py",
|
| "analyze",
|
| "-m",
|
| "tryserver.chromium.win",
|
| @@ -386,14 +386,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "tryserver.chromium.win",
|
| "-b",
|
| "win_chromium_rel_ng",
|
| "--config-file",
|
| - "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| "//out/Release"
|
| @@ -418,7 +418,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]\\win\\src",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -458,19 +458,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\webkit_lint.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\scripts\\webkit_lint.py",
|
| "--build-config-fs",
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"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\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
|
| "run",
|
| "--output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -487,19 +487,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\webkit_python_tests.py",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\testing\\scripts\\webkit_python_tests.py",
|
| "--build-config-fs",
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"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\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]\\\\win_chromium_rel_ng\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"win_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}",
|
| "run",
|
| "--output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -516,13 +516,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]\\win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
|
| "--target",
|
| "Release",
|
| "--results-directory",
|
| "[SLAVE_BUILD]\\layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\win\\src\\out",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\out",
|
| "--json-test-results",
|
| "/path/to/tmp/json",
|
| "--test-results-server",
|
| @@ -537,7 +537,7 @@
|
| "tryserver.chromium.win",
|
| "--debug-rwt-logging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -554,7 +554,7 @@
|
| "--results-dir",
|
| "[SLAVE_BUILD]\\layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]\\win\\src\\out",
|
| + "[BUILDER_CACHE]\\win_chromium_rel_ng\\src\\out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| @@ -564,7 +564,7 @@
|
| "--staging-dir",
|
| "[CACHE]\\chrome_staging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -582,7 +582,7 @@
|
| "--target",
|
| "Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]\\win",
|
| + "cwd": "[BUILDER_CACHE]\\win_chromium_rel_ng",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|