Snap for 4448085 from a4f727d733bf764a62a9f25ad51ef12db2ac8c86 to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-release

Change-Id: I47bf645487e1cddd5f783a17d4273f17a8aab51f

9 files changed, 15 insertions, 50 deletions

diff --git a/api/proc/ProcQtaguidCtrlTest.py b/api/proc/ProcQtaguidCtrlTest.py
index b1ed6681..7948d455 100644
--- a/api/proc/ProcQtaguidCtrlTest.py
+++ b/api/proc/ProcQtaguidCtrlTest.py
@@ -40,7 +40,10 @@ class ProcQtaguidCtrlTest(KernelProcFileTestBase.KernelProcFileTestBase):
             "events: sockets_tagged={:d} sockets_untagged={:d} counter_set_changes={:d} "
             "delete_cmds={:d} iface_events={:d} match_calls={:d} match_calls_prepost={:d} "
             "match_found_sk={:d} match_found_sk_in_ct={:d} match_found_no_sk_in_ct={:d} "
-            "match_no_sk={:d} match_no_sk_file={:d}", lines[-2])
+            "match_no_sk={:d} match_no_sk_{:w}={:d}", lines[-2])
+        if parsed[-2] not in {"file", "gid"}:
+            raise SyntaxError("match_no_sk_{file|gid} incorrect")
+        del parsed[-2]
         if any(map(lambda x: x < 0, parsed)):
             raise SyntaxError("Negative numbers not allowed!")
         result.append(parsed)
diff --git a/api/proc/ProcVmallocInfoTest.py b/api/proc/ProcVmallocInfoTest.py
index bd1368a4..bf0bff0a 100644
--- a/api/proc/ProcVmallocInfoTest.py
+++ b/api/proc/ProcVmallocInfoTest.py
@@ -95,6 +95,7 @@ class ProcVmallocInfoTest(KernelProcFileTestBase.KernelProcFileTestBase):
 
     def p_caller(self, p):
         '''caller : CALLER
+                  | HEX_LITERAL
                   | empty'''
         p[0] = p[1]
 
diff --git a/config/data/android-4.9/android-base.cfg b/config/data/android-4.9/android-base.cfg
index a393f83e..82932530 100644
--- a/config/data/android-4.9/android-base.cfg
+++ b/config/data/android-4.9/android-base.cfg
@@ -149,7 +149,6 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_STAGING=y
-CONFIG_SYNC=y
 CONFIG_TUN=y
 CONFIG_UID_SYS_STATS=y
 CONFIG_UNIX=y
diff --git a/linux_kselftest/stable/AndroidTest.xml b/linux_kselftest/stable/AndroidTest.xml
index b18d0541..bad36aed 100644
--- a/linux_kselftest/stable/AndroidTest.xml
+++ b/linux_kselftest/stable/AndroidTest.xml
@@ -24,5 +24,6 @@
         <option name="test-module-name" value="VtsKernelLinuxKselftest" />
         <option name="test-case-path" value="vts/testcases/kernel/linux_kselftest/LinuxKselftestTest" />
         <option name="test-config-path" value="vts/testcases/kernel/linux_kselftest/stable/LinuxKselftestTest.config" />
+        <option name="runtime-hint" value="8m"/>
     </test>
 </configuration>
diff --git a/ltp/KernelLtpTest.py b/ltp/KernelLtpTest.py
index 721316f3..ccf8880b 100644
--- a/ltp/KernelLtpTest.py
+++ b/ltp/KernelLtpTest.py
@@ -400,15 +400,9 @@ class KernelLtpTest(base_test.BaseTestClass):
                                                      (True, test_case.note))
                 continue
 
-<<<<<<< HEAD
-            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,
+                envp=self.GetEnvp(), cwd=ltp_configs.LTPBINPATH,
                 commands=test_case.command)
->>>>>>> d6a5ac6... update LTP to use the new filter class from runner
 
             logging.info("Worker {} starts executing command "
                          "for '{}'.\n  Command:{}".format(id, test_case, cmd))
@@ -461,15 +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)
 
-<<<<<<< HEAD
-        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,
+            envp=self.GetEnvp(), cwd=ltp_configs.LTPBINPATH,
             commands=test_case.command)
->>>>>>> d6a5ac6... update LTP to use the new filter class from runner
         logging.info("Executing %s", cmd)
         self.CheckResult(self.shell.Execute(cmd))
 
diff --git a/ltp/configs/disabled_tests.py b/ltp/configs/disabled_tests.py
index d4d5f216..3bd819fe 100644
--- a/ltp/configs/disabled_tests.py
+++ b/ltp/configs/disabled_tests.py
@@ -363,6 +363,8 @@ DISABLED_TESTS = [
     'mm.thp02_64bit',
     'mm.thp03_64bit',
     'mm.vma01_64bit',
+    # b/65636203
+    'mm.thp01_32bit',
     # kmsg01 would pass but it occasionally causes socket timeout and misalignment
     # of request and response
     # b/32343072
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/stable/AndroidTest.xml b/ltp/stable/AndroidTest.xml
index e279e756..2b1016bd 100644
--- a/ltp/stable/AndroidTest.xml
+++ b/ltp/stable/AndroidTest.xml
@@ -22,7 +22,7 @@
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsKernelLtp" />
         <option name="test-timeout" value="3h" />
-        <option name="runtime-hint" value="1h" />
+        <option name="runtime-hint" value="20m" />
         <option name="test-case-path" value="vts/testcases/kernel/ltp/KernelLtpTest" />
     </test>
 </configuration>
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"""