commit ecfcc7da8eb6db2c31bc45eb1d1b89ac231082a9
author Brett Chabot <brettchabot@android.com> Sun Jul 17 14:04:37 2011 -0700
committer Brett Chabot <brettchabot@android.com> Sun Jul 17 14:06:20 2011 -0700
tree d0f943a8a26ebee8737f5ff44e4a5e88ba030bfd
parent e8ceb3f0b6829a07a12a6c45366ea53275cc5f60

Fix runtest --path for tests built against SDK.

Bug 4556556

Change-Id: I3f829cae8f9fc1e64b3a44ac9e306b13b3cead7c

testrunner/test_defs/test_walker.py

diff --git a/testrunner/test_defs/test_walker.py b/testrunner/test_defs/test_walker.py
index de93c80..2989125 100755
--- a/testrunner/test_defs/test_walker.py
+++ b/testrunner/test_defs/test_walker.py
@@ -191,7 +191,7 @@
     """
     if android_mk_parser.HasGTest():
       return gtest.GTestFactory(path, upstream_build_path=upstream_build_path)
-    elif android_mk_parser.HasJavaLibrary('android.test.runner'):
+    elif instrumentation_test.HasInstrumentationTest(path):
       return instrumentation_test.InstrumentationTestFactory(path,
           upstream_build_path=upstream_build_path)
     else: