Snap for 4402249 from 8e83218ec3beaaf630d812fb1dda90b5190a80d5 to oc-mr1-releaseandroid-wear-8.1.0_r1android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I2e0bfc2909d485649dca82291c13de6a0865ea27

3 files changed, 10 insertions, 37 deletions

diff --git a/ltp/KernelLtpTest.py b/ltp/KernelLtpTest.py
index 3146ab5f..ccf8880b 100644
--- a/ltp/KernelLtpTest.py
+++ b/ltp/KernelLtpTest.py
@@ -400,8 +400,9 @@ class KernelLtpTest(base_test.BaseTestClass):
                                                      (True, test_case.note))
                 continue
 
-            cmd = "export {envp} && {commands}".format(
-                envp=self.GetEnvp(), commands=test_case.GetCommand())
+            cmd = "export {envp} && cd {cwd} && {commands}".format(
+                envp=self.GetEnvp(), cwd=ltp_configs.LTPBINPATH,
+                commands=test_case.command)
 
             logging.info("Worker {} starts executing command "
                          "for '{}'.\n  Command:{}".format(id, test_case, cmd))
@@ -454,8 +455,9 @@ class KernelLtpTest(base_test.BaseTestClass):
         asserts.skipIf(test_case.is_filtered, test_case.note)
         asserts.skipIf(not self._requirement.Check(test_case), test_case.note)
 
-        cmd = "export {envp} && {commands}".format(
-            envp=self.GetEnvp(), commands=test_case.GetCommand())
+        cmd = "export {envp} && cd {cwd} && {commands}".format(
+            envp=self.GetEnvp(), cwd=ltp_configs.LTPBINPATH,
+            commands=test_case.command)
         logging.info("Executing %s", cmd)
         self.CheckResult(self.shell.Execute(cmd))
 
diff --git a/ltp/configs/stable_tests.py b/ltp/configs/stable_tests.py
index c33da36c..fc918f48 100644
--- a/ltp/configs/stable_tests.py
+++ b/ltp/configs/stable_tests.py
@@ -193,7 +193,6 @@ STABLE_TESTS = [
     'mm.page02_64bit',
     'mm.stack_space_32bit',
     'mm.stack_space_64bit',
-    'mm.thp01_32bit',
     'mm.vma01_32bit',
     'nptl.nptl01_32bit',
     'nptl.nptl01_64bit',
@@ -230,12 +229,8 @@ STABLE_TESTS = [
     'syscalls.accept01_64bit',
     'syscalls.access01_32bit',
     'syscalls.access01_64bit',
-    'syscalls.access02_32bit',
-    'syscalls.access02_64bit',
     'syscalls.access03_32bit',
     'syscalls.access03_64bit',
-    'syscalls.access04_32bit',
-    'syscalls.access04_64bit',
     'syscalls.access05_32bit',
     'syscalls.access05_64bit',
     'syscalls.add_key01_32bit',
@@ -662,8 +657,6 @@ STABLE_TESTS = [
     'syscalls.futimesat01_64bit',
     'syscalls.get_robust_list01_32bit',
     'syscalls.get_robust_list01_64bit',
-    'syscalls.getcwd01_32bit',
-    'syscalls.getcwd01_64bit',
     'syscalls.getcwd04_32bit',
     'syscalls.getcwd04_64bit',
     'syscalls.getdents01_32bit',
@@ -1086,10 +1079,6 @@ STABLE_TESTS = [
     'syscalls.preadv01_64bit',
     'syscalls.preadv02_64_32bit',
     'syscalls.preadv02_64_64bit',
-    'syscalls.pselect01_32bit',
-    'syscalls.pselect01_64_32bit',
-    'syscalls.pselect01_64_64bit',
-    'syscalls.pselect01_64bit',
     'syscalls.pselect02_32bit',
     'syscalls.pselect02_64_32bit',
     'syscalls.pselect02_64_64bit',
diff --git a/ltp/test_case.py b/ltp/test_case.py
index 6862a3cf..85a9a94f 100644
--- a/ltp/test_case.py
+++ b/ltp/test_case.py
@@ -92,28 +92,10 @@ class TestCase(object):
         """Set the test case's name."""
         self._testname = testname
 
-    def InternalAddLtpPathToCommand(self, command):
-        """Internal function to change binary in commands to their full path"""
-        tokens = command.strip().split()
-
-        # If not ltp executables:
-        if (tokens[0] in ltp_configs.INTERNAL_BINS or
-                tokens[0] in ltp_configs.INTERNAL_SHELL_COMMANDS or
-                tokens[0].find('=') > 0):
-            return command
-        else:  # Is Ltp executable
-            tokens[0] = path_utils.JoinTargetPath(ltp_configs.LTPBINPATH,
-                                                  tokens[0])
-            return ' '.join(tokens)
-
-    def GetCommand(self):
-        """Get test case's command.
-
-        Get the test case's command where ltp test binary names have been
-        replaced with their full paths
-        """
-        return '&&'.join((self.InternalAddLtpPathToCommand(command)
-                          for command in self._command.split('&&')))
+    @property
+    def command(self):
+        """Get the test case's command."""
+        return self._command
 
     def InternalGetExecutableNames(self):
         """Get a generator of all required executable file names"""