Attempt to fix runtest for native tests.
Create dest dir before pushing
Use correct exec path data/nativetest/test/test
Change-Id: Ib2555c0e98ea5e13fdf6bf24697bd1b82d74b681
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index f7a4759..ba09d97 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -301,6 +301,9 @@
m = self._RE_MAKE_INSTALL_PATH.match(install_path)
if m:
remote_path = m.group(1)
+ remote_dir = os.path.dirname(remote_path)
+ logger.Log("adb shell mkdir -p %s" % remote_dir)
+ self._adb.SendShellCommand("mkdir -p %s" % remote_dir)
abs_install_path = os.path.join(self._root_path, install_path)
logger.Log("adb push %s %s" % (abs_install_path, remote_path))
self._adb.Push(abs_install_path, remote_path)
diff --git a/testrunner/test_defs/gtest.py b/testrunner/test_defs/gtest.py
index 094ceea..dc72f94 100644
--- a/testrunner/test_defs/gtest.py
+++ b/testrunner/test_defs/gtest.py
@@ -89,7 +89,8 @@
logger.SilentLog('Creating gtest suite for file %s' % test_file)
suite = GTestSuite()
suite.SetBuildPath(self.GetBuildPath())
- suite.SetTargetExecPath(os.path.join(target_root_path, test_file))
+ # expect tests in /data/nativetest/test_file/test_file
+ suite.SetTargetExecPath(os.path.join(target_root_path, test_file, test_file))
test_suites.append(suite)
return test_suites