| Index: build/android/run_tests.py
|
| diff --git a/build/android/run_tests.py b/build/android/run_tests.py
|
| index 119535da028650fd6e4ddd78adc9083afceb2067..ece008c518af33e85cf6785e45051560ca0e02db 100755
|
| --- a/build/android/run_tests.py
|
| +++ b/build/android/run_tests.py
|
| @@ -31,49 +31,13 @@ one test per line. Here is an example:
|
|
|
| This file is generated by the tests running on devices. If running on emulator,
|
| additonal filter file which lists the tests only failed in emulator will be
|
| -loaded. We don't care about the rare testcases which succeeded on emuatlor, but
|
| +loaded. We don't care about the rare testcases which succeeded on emulator, but
|
| failed on device.
|
| """
|
|
|
| -import optparse
|
| +import subprocess
|
| import sys
|
|
|
| -from pylib import cmd_helper
|
| -from pylib.gtest import dispatch
|
| -from pylib.utils import emulator
|
| -from pylib.utils import run_tests_helper
|
| -from pylib.utils import test_options_parser
|
| -
|
| -
|
| -def main(argv):
|
| - option_parser = optparse.OptionParser()
|
| - test_options_parser.AddGTestOptions(option_parser)
|
| - options, args = option_parser.parse_args(argv)
|
| -
|
| - if len(args) > 1:
|
| - option_parser.error('Unknown argument: %s' % args[1:])
|
| -
|
| - run_tests_helper.SetLogLevel(options.verbose_count)
|
| -
|
| - if options.out_directory:
|
| - cmd_helper.OutDirectory.set(options.out_directory)
|
| -
|
| - if options.use_emulator:
|
| - emulator.DeleteAllTempAVDs()
|
| -
|
| - failed_tests_count = dispatch.Dispatch(options)
|
| -
|
| - # Failures of individual test suites are communicated by printing a
|
| - # STEP_FAILURE message.
|
| - # Returning a success exit status also prevents the buildbot from incorrectly
|
| - # marking the last suite as failed if there were failures in other suites in
|
| - # the batch (this happens because the exit status is a sum of all failures
|
| - # from all suites, but the buildbot associates the exit status only with the
|
| - # most recent step).
|
| - if options.exit_code:
|
| - return failed_tests_count
|
| - return 0
|
| -
|
| -
|
| if __name__ == '__main__':
|
| - sys.exit(main(sys.argv))
|
| + args = ["./run_all_tests.py", "--gtest"] + sys.argv[1:]
|
| + sys.exit(subprocess.call(args))
|
|
|