| Index: scripts/slave/recipes/findit/chromium/test.expected/test_without_targets_not_skipped.json
|
| diff --git a/scripts/slave/recipes/findit/chromium/test.expected/test_without_targets_not_skipped.json b/scripts/slave/recipes/findit/chromium/test.expected/test_without_targets_not_skipped.json
|
| index d19c88fe1b26572bf9cf3afd32aa983dd32ca328..7f4187cc733d9b17bb9e0c7a5ef1504f602fae5a 100644
|
| --- a/scripts/slave/recipes/findit/chromium/test.expected/test_without_targets_not_skipped.json
|
| +++ b/scripts/slave/recipes/findit/chromium/test.expected/test_without_targets_not_skipped.json
|
| @@ -3,7 +3,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| + "[BUILD]\\scripts\\slave\\kill_processes.py"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "taskkill"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
|
| "--master",
|
| "tryserver.chromium.win",
|
| "--builder",
|
| @@ -26,7 +35,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| @@ -100,7 +109,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| + "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
|
| "--version"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -114,13 +123,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE[depot_tools]/gclient.py",
|
| + "RECIPE_PACKAGE[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| + "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -128,7 +137,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -136,9 +145,9 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| + "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| @@ -152,25 +161,25 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.win.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| - "git",
|
| + "[DEPOT_TOOLS]\\git.bat",
|
| "log",
|
| "--format=%H",
|
| "r0..r1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[SLAVE_BUILD]\\src",
|
| "name": "git commits in range",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -187,7 +196,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| + "[BUILD]\\scripts\\slave\\kill_processes.py"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "test r1.taskkill",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[depot_tools::bot_update]\\resources\\bot_update.py",
|
| "--master",
|
| "tryserver.chromium.win",
|
| "--builder",
|
| @@ -210,7 +231,7 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "test r1.bot_update",
|
| "~followup_annotations": [
|
| @@ -285,13 +306,13 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE[depot_tools]/gclient.py",
|
| + "RECIPE_PACKAGE[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE[depot_tools]"
|
| + "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE[depot_tools]"
|
| },
|
| "name": "test r1.gclient runhooks",
|
| "~followup_annotations": [
|
| @@ -302,7 +323,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -310,9 +331,9 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| + "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "test r1.get compile targets for scripts",
|
| @@ -327,14 +348,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.win.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "test r1.read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.win.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]\\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\": [@@@",
|
| @@ -358,13 +379,13 @@
|
| },
|
| {
|
| "cmd": [
|
| - "git",
|
| + "[DEPOT_TOOLS]\\git.bat",
|
| "diff",
|
| "r1~1",
|
| "r1",
|
| "--name-only"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[SLAVE_BUILD]\\src",
|
| "name": "test r1.git diff to analyze commit",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -378,14 +399,14 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
|
| + "[SLAVE_BUILD]\\src\\testing\\buildbot\\trybot_analyze_config.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "test r1.read filter exclusion spec",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| + "@@@STEP_TEXT@path: 'testing\\\\buildbot\\\\trybot_analyze_config.json'@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@",
|
| @@ -404,14 +425,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/gyp_chromium",
|
| + "[SLAVE_BUILD]\\src\\build\\gyp_chromium",
|
| "--analyzer",
|
| "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": [\"unaffected_tests\", \"unaffected_tests_run\"]}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[BUILD]\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1"
|
| },
|
| "name": "test r1.analyze",
|
| "~followup_annotations": [
|
| @@ -440,14 +461,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/checkperms.py",
|
| + "[BUILD]\\scripts\\slave\\chromium\\run_crash_handler.py",
|
| + "--target",
|
| + "Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "test r1.start_crash_service",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]\\src\\testing\\scripts\\checkperms.py",
|
| "--build-config-fs",
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| + "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]\\\\src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}",
|
| + "{\"buildername\": \"win_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.win\", \"slavename\": \"build1-a1\", \"target_platform\": \"win\"}",
|
| "run",
|
| "--output",
|
| "/path/to/tmp/json"
|
| @@ -467,6 +502,20 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILD]\\scripts\\slave\\process_dumps.py",
|
| + "--target",
|
| + "Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "test r1.process_dumps",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
|
|