| Index: scripts/slave/recipes/findit/chromium/compile.expected/successful_compile_targets_returned_by_analyze.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json b/scripts/slave/recipes/findit/chromium/compile.expected/successful_compile_targets_returned_by_analyze.json
|
| similarity index 80%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json
|
| copy to scripts/slave/recipes/findit/chromium/compile.expected/successful_compile_targets_returned_by_analyze.json
|
| index b42c493b32ebe6be9c6e8a5294d5f2784352a8ef..d128d4281371246d6a5a8b0857d498ce7279ac8d 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/compile_because_of_analyze_with_filtered_tests.json
|
| +++ b/scripts/slave/recipes/findit/chromium/compile.expected/successful_compile_targets_returned_by_analyze.json
|
| @@ -1,5 +1,10 @@
|
| [
|
| {
|
| + "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "test r1"
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -7,30 +12,25 @@
|
| "--master",
|
| "tryserver.chromium.linux",
|
| "--builder",
|
| - "linux_chromium_rel_ng",
|
| + "linux_variable",
|
| "--slave",
|
| - "TestSlavename",
|
| + "build1-a1",
|
| "--spec",
|
| "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| - "--issue",
|
| - "12853011",
|
| - "--patchset",
|
| - "1",
|
| - "--rietveld_server",
|
| - "https://codereview.chromium.org",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@HEAD",
|
| + "src@r1",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "bot_update",
|
| + "name": "test r1.bot_update",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| @@ -102,9 +102,10 @@
|
| "--version"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "swarming.py --version",
|
| + "name": "test r1.swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@0.4.10@@@"
|
| ]
|
| },
|
| @@ -118,9 +119,12 @@
|
| "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1"
|
| },
|
| - "name": "gclient runhooks (with patch)"
|
| + "name": "test r1.gclient runhooks",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -131,8 +135,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "read test spec",
|
| + "name": "test r1.read test spec",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| @@ -152,35 +157,29 @@
|
| "--paths",
|
| "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
|
| "--properties",
|
| - "{\"buildername\": \"linux_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "get compile targets for scripts",
|
| + "name": "test r1.get compile targets for scripts",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| - "killall",
|
| - "-9",
|
| - "gnome-keyring-daemon"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "killall gnome-keyring-daemon"
|
| - },
|
| - {
|
| - "cmd": [
|
| "git",
|
| "diff",
|
| - "--cached",
|
| + "r1~1",
|
| + "r1",
|
| "--name-only"
|
| ],
|
| "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "git diff to analyze patch",
|
| + "name": "test r1.git diff to analyze commit",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@files@foo.cc@@@",
|
| "@@@STEP_LOG_END@files@@@"
|
| ]
|
| @@ -194,8 +193,9 @@
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "read filter exclusion spec",
|
| + "name": "test r1.read filter exclusion spec",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"base\": {@@@",
|
| @@ -218,26 +218,27 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "analyze",
|
| "-m",
|
| - "tryserver.chromium.linux",
|
| + "chromium.linux",
|
| "-b",
|
| - "linux_chromium_rel_ng",
|
| + "Linux Builder",
|
| "-v",
|
| "//out/Release",
|
| - "{\"additional_compile_targets\": [\"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": [\"angle_unittests_run\", \"chrome\", \"content_gl_tests_run\", \"gl_tests_run\", \"gl_unittests_run\", \"tab_capture_end2end_tests_run\", \"telemetry_gpu_test_run\"]}",
|
| + "{\"additional_compile_targets\": [\"chromium_swarm_tests\"], \"files\": [\"foo.cc\"], \"test_targets\": []}",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "analyze",
|
| + "name": "test r1.analyze",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_target\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_target_run\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"status\": \"Found dependency\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_target\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test_target_run\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| @@ -246,26 +247,18 @@
|
| "@@@STEP_LOG_LINE@analyze_details@ \"chromium_swarm_tests\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"browser_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"browser_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"browser_tests\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"base_unittests\"@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target\", @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_target_run\"@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"angle_unittests_run\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"chrome\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"content_gl_tests_run\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"gl_tests_run\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"gl_unittests_run\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"tab_capture_end2end_tests_run\", @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"telemetry_gpu_test_run\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ]@@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@}@@@",
|
| "@@@STEP_LOG_END@analyze_details@@@"
|
| ]
|
| @@ -277,7 +270,10 @@
|
| "[BUILD]/scripts/slave/cleanup_temp.py"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "cleanup_temp"
|
| + "name": "test r1.cleanup_temp",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -286,9 +282,9 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "tryserver.chromium.linux",
|
| + "chromium.linux",
|
| "-b",
|
| - "linux_chromium_rel_ng",
|
| + "Linux Builder",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -296,7 +292,10 @@
|
| "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "generate_build_files (with patch)"
|
| + "name": "test r1.generate_build_files",
|
| + "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| @@ -315,21 +314,38 @@
|
| "/path/to/tmp/json",
|
| "--goma-dir",
|
| "[BUILD]/goma",
|
| - "--goma-fail-fast",
|
| - "--goma-disable-local-fallback",
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| - "base_unittests",
|
| - "browser_tests"
|
| + "test_target",
|
| + "test_target_run"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "compile (with patch)",
|
| + "name": "test r1.compile",
|
| "~followup_annotations": [
|
| + "@@@STEP_NEST_LEVEL@1@@@",
|
| "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| ]
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "import sys; sys.exit(0)"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "report",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@result@[@@@",
|
| + "@@@STEP_LOG_LINE@result@ [@@@",
|
| + "@@@STEP_LOG_LINE@result@ \"r1\", @@@",
|
| + "@@@STEP_LOG_LINE@result@ \"passed\"@@@",
|
| + "@@@STEP_LOG_LINE@result@ ]@@@",
|
| + "@@@STEP_LOG_LINE@result@]@@@",
|
| + "@@@STEP_LOG_END@result@@@"
|
| + ]
|
| + },
|
| + {
|
| "name": "$result",
|
| "recipe_result": null,
|
| "status_code": 0
|
|
|