Merge "Handle the new location for LTP"
diff --git a/ltp/KernelLtpTest.py b/ltp/KernelLtpTest.py
index 1e1bbe2..c7f9f49 100644
--- a/ltp/KernelLtpTest.py
+++ b/ltp/KernelLtpTest.py
@@ -141,7 +141,7 @@
result.append("%s_%s" % (item, const.SUFFIX_64BIT))
return result
- def PreTestSetup(self, n_bit):
+ def PreTestSetup(self, test_bit):
"""Setups that needs to be done before any tests."""
replacements = {'#\\!/bin/sh': '#\\!/system/bin/sh',
'#\\! /bin/sh': '#\\!/system/bin/sh',
@@ -149,7 +149,7 @@
'#\\! /bin/bash': '#\\!/system/bin/sh',
'bs=1M': 'bs=1m',
'/var/run': ltp_configs.TMP}
- src_host = os.path.join(self.data_file_path, str(n_bit), 'ltp')
+ src_host = os.path.join(self.data_file_path, 'DATA', test_bit, 'ltp')
sed_command = self._shell_env.CreateSedCommand(src_host, replacements)
logging.info('Executing sed commands on host: %s', sed_command)
results = cmd_utils.ExecuteShellCommand(sed_command)
@@ -162,13 +162,13 @@
self._report_thread_lock = threading.Lock()
- def PushFiles(self, n_bit):
+ def PushFiles(self, test_bit):
"""Push the related files to target.
Args:
- n_bit: int, bitness
+ test_bit: nativetest or nativetest64
"""
- src = os.path.join(self.data_file_path, str(n_bit), 'ltp', '.')
+ src = os.path.join(self.data_file_path, 'DATA', test_bit, 'ltp', '.')
logging.info('Pushing files from %s to %s', src, ltp_configs.LTPDIR)
self.shell.Execute("mkdir %s -p" % ltp_configs.LTPDIR)
self._dut.adb.push(src, ltp_configs.LTPDIR)
@@ -243,8 +243,11 @@
Args:
n_bit: int, bitness
"""
- self.PreTestSetup(n_bit)
- self.PushFiles(n_bit)
+ test_bit = 'nativetest'
+ if n_bit == 64:
+ test_bit += '64'
+ self.PreTestSetup(test_bit)
+ self.PushFiles(test_bit)
test_cases = list(
self._testcases.Load(
@@ -252,7 +255,7 @@
logging.info("Checking binary exists for all test cases.")
self._requirement.ltp_bin_host_path = os.path.join(
- self.data_file_path, str(n_bit), 'ltp', 'testcases', 'bin')
+ self.data_file_path, 'DATA', test_bit, 'ltp', 'testcases', 'bin')
self._requirement.CheckAllTestCaseExecutables(test_cases)
logging.info("Start running %i individual tests." % len(test_cases))
diff --git a/ltp/ltp_configs.py b/ltp/ltp_configs.py
index 6f3003a..d490a28 100644
--- a/ltp/ltp_configs.py
+++ b/ltp/ltp_configs.py
@@ -18,7 +18,7 @@
from vts.testcases.kernel.ltp import ltp_enums
-VTS_LTP_OUTPUT = 'ltp'
+VTS_LTP_OUTPUT = 'DATA/nativetest/ltp'
LTP_RUNTEST_DIR = os.path.join(VTS_LTP_OUTPUT, 'runtest')
LTP_DISABLED_BUILD_TESTS_CONFIG_PATH = os.path.join(VTS_LTP_OUTPUT, 'disabled_tests.txt')
