Fix the errors for run_tests.py

build/android/run_tests.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 58 matching lines @@
 _TEST_SUITES = ['base_unittests',
                 'content_unittests',
                 'gpu_unittests',
                 'ipc_tests',
                 'net_unittests',
                 'sql_unittests',
                 'sync_unit_tests',
                 'ui_unittests',
                ]
 
-def FullyQualifiedTestSuites(apk):
+def FullyQualifiedTestSuites(apk, test_suites):
   """Return a fully qualified list that represents all known suites.
 
   Args:
-    apk: if True, use the apk-based test runner"""
+    apk: if True, use the apk-based test runner
+    test_suites: the source test suites to process"""
   # If not specified, assume the test suites are in out/Release
   test_suite_dir = os.path.abspath(os.path.join(constants.CHROME_DIR,
                                                 'out', 'Release'))
   if apk:
     # out/Release/$SUITE_apk/$SUITE-debug.apk
     suites = [os.path.join(test_suite_dir,
                            t + '_apk',
                            t + '-debug.apk')
-              for t in _TEST_SUITES]
+              for t in test_suites]
   else:
     suites = [os.path.join(test_suite_dir, t) for t in _TEST_SUITES]
   return suites
 
 
 class TimeProfile(object):
   """Class for simple profiling of action, with logging of cost."""
 
   def __init__(self, description):
     self._description = description
@@ skipping 89 matching lines @@
   Returns:
     A TestResults object.
   """
   results = []
   global _TEST_SUITES
 
   if test_suite:
     global _TEST_SUITES
 
     # If not specified, assume the test suites are in out/Release
-    test_suite_dir = os.path.abspath(os.path.join(run_tests_helper.CHROME_DIR,
-                                                'out', 'Release'))
-    if apk:
-      # out/Release/$SUITE_apk/$SUITE-debug.apk
-      test_suite = os.path.join(test_suite_dir,
-                           test_suite + '_apk',
-                           test_suite + '-debug.apk')
-    else:
-      test_suite = os.path.join(test_suite_dir, test_suite)
-
+    test_suite_dir = os.path.abspath(os.path.join(constants.CHROME_DIR,
+                                                  'out', 'Release'))

[gone, 2012/07/11 21:55:17]

Saw this line during our downstream merge.  Is it still necessary?

[yongsheng, 2012/07/12 01:34:44]

oh, I think you're right. should be removed. I'll do it. thanks for your info.

     if (not os.path.exists(test_suite)):
       logging.critical('Unrecognized test suite %s, supported: %s' %
                        (test_suite, _TEST_SUITES))
       if test_suite in _TEST_SUITES:
         logging.critical('(Remember to include the path: out/Release/%s)',
                          test_suite)
       test_suite_basename = os.path.basename(test_suite)
       if test_suite_basename in _TEST_SUITES:
         logging.critical('Try "make -j15 %s"' % test_suite_basename)
       else:
         logging.critical('Unrecognized test suite, supported: %s' %
                          _TEST_SUITES)
-      return TestResults.FromOkAndFailed([], [BaseTestResult(test_suite, '')],
+      return TestResults.FromRun([], [BaseTestResult(test_suite, '')],
                                          False, False)
     fully_qualified_test_suites = [test_suite]
   else:
-    fully_qualified_test_suites = FullyQualifiedTestSuites(apk)
+    fully_qualified_test_suites = FullyQualifiedTestSuites(apk, _TEST_SUITES)
   debug_info_list = []
   print 'Known suites: ' + str(_TEST_SUITES)
   print 'Running these: ' + str(fully_qualified_test_suites)
   for t in fully_qualified_test_suites:
     if annotate:
       print '@@@BUILD_STEP Test suite %s@@@' % os.path.basename(t)
     test = SingleTestRunner(device, t, gtest_filter, test_arguments,
                             timeout, rebaseline, performance_test,
                             cleanup_test_files, tool, 0, not not log_dump_name)
     test.Run()
@@ skipping 168 matching lines @@
   """
   if options.test_suite == 'help':
     ListTestSuites()
     return 0
 
   if options.use_xvfb:
     xvfb = Xvfb()
     xvfb.Start()
 
   if options.test_suite:
-    all_test_suites = [options.test_suite]
+    all_test_suites = FullyQualifiedTestSuites(options.apk,
+                                               [options.test_suite])
   else:
-    all_test_suites = FullyQualifiedTestSuites(options.apk)
+    all_test_suites = FullyQualifiedTestSuites(options.apk,
+                                               _TEST_SUITES)
   failures = 0
   for suite in all_test_suites:
     options.test_suite = suite
     failures += _RunATestSuite(options)
 
   if options.use_xvfb:
     xvfb.Stop()
   return failures
 
 
@@ skipping 68 matching lines @@
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.annotate:
     return 0
   else:
     return failed_tests_count
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))