LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix runtest for native tests.

Browse Source 
Create dest dir before pushing
Use correct exec path data/nativetest/test/test

Change-Id: Ib2555c0e98ea5e13fdf6bf24697bd1b82d74b681
This commit is contained in:
Brett Chabot
2013-05-16 23:00:43 -07:00
parent 72a0a13adb
commit e607d3a8a4
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testrunner/runtest.py
View File

@@ -301,6 +301,9 @@ class TestRunner(object):
m = self._RE_MAKE_INSTALL_PATH.match(install_path) m = self._RE_MAKE_INSTALL_PATH.match(install_path)
if m: if m:
remote_path = m.group(1) 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) abs_install_path = os.path.join(self._root_path, install_path)
logger.Log("adb push %s %s" % (abs_install_path, remote_path)) logger.Log("adb push %s %s" % (abs_install_path, remote_path))
self._adb.Push(abs_install_path, remote_path) self._adb.Push(abs_install_path, remote_path)

3
testrunner/test_defs/gtest.py
View File

@@ -89,7 +89,8 @@ class GTestFactory(test_suite.AbstractTestFactory):
logger.SilentLog('Creating gtest suite for file %s' % test_file) logger.SilentLog('Creating gtest suite for file %s' % test_file)
suite = GTestSuite() suite = GTestSuite()
suite.SetBuildPath(self.GetBuildPath()) 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) test_suites.append(suite)
return test_suites return test_suites