auto-detect directory when running tests with specified test_suite

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 179 matching lines @@
     annotate: should we print buildbot-style annotations?
 
   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)
+
     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:
@@ skipping 276 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))