Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index a99d4e177fb1ec11ae95c824bb5e8b7b72c45145..5195b97c7eb9dcec18c12d11c283b0b70bdb7d98 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -286,9 +286,7 @@ def RunInstrumentationSuite(options, test, flunk_on_failure=True, |
def RunWebkitLint(target): |
"""Lint WebKit's TestExpectation files.""" |
bb_annotations.PrintNamedStep('webkit_lint') |
- RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py'), |
- '--lint-test-files', |
- '--chromium', |
+ RunCmd([SrcPath('third_party/WebKit/Tools/Scripts/lint-test-expectations'), |
'--target', target]) |
@@ -326,8 +324,8 @@ def RunWebkitLayoutTests(options): |
cmd_args.extend( |
['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) |
- exit_code = RunCmd([SrcPath('webkit/tools/layout_tests/run_webkit_tests.py')] |
- + cmd_args) |
+ exit_code = RunCmd([ |
+ SrcPath('third_party/WebKit/Tools/Scripts/run-webkit-tests')] + cmd_args) |
cmp
2014/09/24 18:14:01
+2 space indent here
but it's strange to break on
|
if exit_code == 255: # test_run_results.UNEXPECTED_ERROR_EXIT_STATUS |
bb_annotations.PrintMsg('?? (crashed or hung)') |
elif exit_code == 254: # test_run_results.NO_DEVICES_EXIT_STATUS |