| Index: scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
|
| diff --git a/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json b/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
|
| index 28376263d82351fad56ca7eec4903fc95da29cbc..43a53d64f0a7229e34fd46142a64172079d3dc8a 100644
|
| --- a/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
|
| +++ b/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
|
| @@ -11,6 +11,28 @@
|
| "cmd": [
|
| "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",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
|
| "--master",
|
| "tryserver.chromium.win",
|
| @@ -32,6 +54,7 @@
|
| "src@r1",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -169,7 +192,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -185,7 +208,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\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",
|
| @@ -198,7 +221,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -206,7 +229,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]\\\\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\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -221,12 +244,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\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: [SLAVE_BUILD]\\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@@@"
|
| ]
|
| @@ -246,7 +269,7 @@
|
| "--format=%H",
|
| "r0..r1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win\\src",
|
| "name": "git commits in range",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -273,6 +296,29 @@
|
| "cmd": [
|
| "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",
|
| + "511"
|
| + ],
|
| + "name": "test r1.makedirs checkout path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
|
| "--master",
|
| "tryserver.chromium.win",
|
| @@ -294,6 +340,7 @@
|
| "src@r1",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -438,7 +485,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\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",
|
| @@ -454,7 +501,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -462,7 +509,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]\\\\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\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
|
| ],
|
| @@ -478,13 +525,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "test r1.read test spec (chromium.win.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]\\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_LINE@json.output@ \"Win7 Tests (1)\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -514,7 +561,7 @@
|
| "r1",
|
| "--name-only"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win\\src",
|
| "name": "test r1.git diff to analyze commit",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -528,7 +575,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| + "[BUILDER_CACHE]\\win\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "test r1.read filter exclusion spec",
|
| @@ -553,7 +600,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
|
| "analyze",
|
| "-m",
|
| "chromium.win",
|
| @@ -626,7 +673,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| + "[BUILDER_CACHE]\\win\\src\\out\\Release",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "test r1.clean isolated files",
|
| @@ -638,21 +685,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.win",
|
| "-b",
|
| "Win Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]\\src\\tools\\mb\\mb_config.pyl",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| "--swarming-targets-file",
|
| "affected_tests\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]\\src",
|
| + "cwd": "[BUILDER_CACHE]\\win\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -678,9 +725,11 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src",
|
| + "[BUILDER_CACHE]\\win\\src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| + "--goma-deps-cache-dir",
|
| + "[GOMA_DEPS_CACHE]",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -710,9 +759,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",
|
| "--build-dir",
|
| - "[SLAVE_BUILD]\\src\\out\\Release",
|
| + "[BUILDER_CACHE]\\win\\src\\out\\Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]\\src"
|
| + "[BUILDER_CACHE]\\win\\src"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "test r1.remove_build_metadata",
|
| @@ -725,14 +774,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[SLAVE_BUILD]\\src\\out\\Release\\affected_tests.isolated.gen.json"
|
| + "[BUILDER_CACHE]\\win\\src\\out\\Release\\affected_tests.isolated.gen.json"
|
| ],
|
| "name": "test r1.isolate tests",
|
| "~followup_annotations": [
|
| @@ -747,7 +796,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client\\swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -807,6 +856,7 @@
|
| "--gtest_filter=Test.One",
|
| "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -836,7 +886,7 @@
|
| "python",
|
| "RECIPE_MODULE[build::swarming]\\resources\\collect_gtest_task.py",
|
| "--swarming-client-dir",
|
| - "[SLAVE_BUILD]\\src\\tools\\swarming_client",
|
| + "[BUILDER_CACHE]\\win\\src\\tools\\swarming_client",
|
| "--temp-root-dir",
|
| "[TMP_BASE]",
|
| "--merged-test-output",
|
| @@ -850,6 +900,7 @@
|
| "--json",
|
| "{\"base_task_name\": \"affected_tests (r1)/Windows-7-SP1/[dummy has/win_chromium_variable/1\", \"tasks\": {\"affected_tests (r1)/Windows-7-SP1/[dummy has/win_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -878,6 +929,7 @@
|
| "--chrome-revision",
|
| "170242"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
| @@ -894,6 +946,7 @@
|
| "--target",
|
| "Release"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]\\win",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
|
| },
|
|
|