Ensure that the native tests are run from /data/nativetest to match TF.
Also cleanup a missing test from test_defs.xml
Change-Id: I9b50bd3f5c7a100a86dd550d367c8ed9a9f2bd62
diff --git a/testrunner/android_build.py b/testrunner/android_build.py
index cacd67e..2baa5af 100644
--- a/testrunner/android_build.py
+++ b/testrunner/android_build.py
@@ -149,6 +149,25 @@
return path
+def GetTargetNativeTestPath():
+ """Returns the full pathname to target/product data/nativetest/ directory.
+
+ Assumes build environment has been properly configured by envsetup &
+ lunch/choosecombo.
+
+ Returns:
+ The absolute file path of the Android target native test directory.
+
+ Raises:
+ AbortError: if Android target native test directory could not be found.
+ """
+ path = os.path.join(GetProductOut(), "data", "nativetest")
+ if not os.path.exists(path):
+ logger.Log("Error: Target native test path could not be found")
+ raise errors.AbortError
+ return path
+
+
def GetTargetSystemBin():
"""Returns the full pathname to the target/product system/bin directory.
