Index: scripts/slave/recipes/android/tester.expected/no_compile_because_of_analyze.json |
diff --git a/scripts/slave/recipes/android/builder.expected/tryserver_chromium_linux_android_clang_dbg_recipe_fail_findbugs.json b/scripts/slave/recipes/android/tester.expected/no_compile_because_of_analyze.json |
similarity index 76% |
copy from scripts/slave/recipes/android/builder.expected/tryserver_chromium_linux_android_clang_dbg_recipe_fail_findbugs.json |
copy to scripts/slave/recipes/android/tester.expected/no_compile_because_of_analyze.json |
index 550146fcde9362879053d5e160e02cf1c7145b42..6ddbee4e8c0f5f75e27b51d600f9bd8a67d6ffc5 100644 |
--- a/scripts/slave/recipes/android/builder.expected/tryserver_chromium_linux_android_clang_dbg_recipe_fail_findbugs.json |
+++ b/scripts/slave/recipes/android/tester.expected/no_compile_because_of_analyze.json |
@@ -7,19 +7,13 @@ |
"--master", |
"tryserver.chromium.linux", |
"--builder", |
- "android_clang_dbg_recipe", |
+ "android_dbg_tests_recipe", |
"--slave", |
- "TestSlavename", |
+ "slavename", |
"--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'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']", |
- "--root", |
- "src", |
"--revision_mapping_file", |
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_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", |
"--output_json", |
"/path/to/tmp/json", |
"--revision", |
@@ -99,7 +93,7 @@ |
"runhooks" |
], |
"env": { |
- "GYP_DEFINES": "OS=android asan=1 clang=1 component=shared_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_allocator=none use_goma=1", |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1", |
"PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
}, |
"name": "gclient runhooks" |
@@ -108,70 +102,54 @@ |
"cmd": [ |
"python", |
"-u", |
- "[DEPOT_TOOLS]/apply_issue.py", |
- "-r", |
- "[SLAVE_BUILD]/src", |
- "-i", |
- "12853011", |
- "-p", |
- "1", |
- "-s", |
- "https://codereview.chromium.org", |
- "--no-auth" |
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", |
+ "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json", |
+ "/path/to/tmp/json" |
], |
- "name": "apply_issue", |
+ "name": "read filter exclusion spec", |
"~followup_annotations": [ |
- "@@@STEP_LINK@Applied issue 12853011@https://codereview.chromium.org/12853011@@@" |
+ "@@@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\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }, @@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"chromium\": {@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"exclusions\": []@@@", |
+ "@@@STEP_LOG_LINE@json.output@ }@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
] |
}, |
{ |
"cmd": [ |
- "python", |
- "-u", |
- "[BUILD]/scripts/slave/compile.py", |
- "--target", |
- "Debug", |
- "--src-dir", |
- "[SLAVE_BUILD]/src", |
- "--build-tool", |
- "ninja", |
- "--compiler", |
- "goma-clang", |
- "--goma-dir", |
- "[BUILD]/goma", |
- "--" |
+ "git", |
+ "diff", |
+ "--cached", |
+ "--name-only" |
], |
- "env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
- }, |
- "name": "compile (with patch)" |
+ "cwd": "[SLAVE_BUILD]/src", |
+ "name": "git diff to analyze patch", |
+ "stdout": "/path/to/tmp/" |
}, |
{ |
"cmd": [ |
"python", |
"-u", |
- "[SLAVE_BUILD]/src/android_webview/tools/webview_licenses.py", |
- "scan" |
- ], |
- "cwd": "[SLAVE_BUILD]/src", |
- "name": "check licenses" |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/src/build/android/findbugs_diff.py" |
+ "[SLAVE_BUILD]/src/build/gyp_chromium", |
+ "--analyzer", |
+ "{\"files\": [\"foo.cc\"], \"targets\": [\"mojo_test_apk\", \"android_webview_test_apk\", \"chrome_shell_test_apk\", \"content_shell_test_apk\", \"base_unittests\", \"breakpad_unittests\", \"cc_unittests\", \"components_unittests\", \"content_browsertests\", \"content_unittests\", \"events_unittests\", \"gl_tests\", \"gpu_unittests\", \"ipc_tests\", \"media_unittests\", \"net_unittests\", \"sandbox_linux_unittests\", \"sql_unittests\", \"sync_unit_tests\", \"ui_unittests\", \"unit_tests\", \"webkit_unit_tests\"]}", |
+ "/path/to/tmp/json" |
], |
"env": { |
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s" |
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1" |
}, |
- "name": "findbugs", |
+ "name": "analyze", |
"~followup_annotations": [ |
- "step returned non-zero exit code: 1", |
- "@@@STEP_FAILURE@@@" |
+ "@@@STEP_TEXT@No compile necessary@@@", |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"status\": \"No compile necessary\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
] |
- }, |
- { |
- "name": "$final_result", |
- "reason": "Step('findbugs') failed with return_code 1", |
- "status_code": 1 |
} |
] |