Merge ~cypressyew/qa-regression-testing:330-fix into qa-regression-testing:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/1788338

The DEBUG_WX config is also available in 4.4 kernel with commit e1a58320.
Change the kernel requirement version from 4.13 to 4.4

diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index c515316..66b35c8 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -2540,8 +2540,8 @@ class KernelSecurityConfigTest(KernelSecurityBaseTest):
         if not (self.dpkg_arch in ['amd64', 'i386', 'arm64']):
             self._skipped("DEBUG_WX is an x86 and arm64 arch feature only")
             expected = False
-        elif not self.kernel_at_least('4.13'):
-            self._skipped('CONFIG_DEBUG_WX added/enabled in 4.13 and newer')
+        elif not self.kernel_at_least('4.4'):
+            self._skipped('CONFIG_DEBUG_WX added/enabled in 4.4 and newer')
             expected = False
         self.assertKernelConfig('DEBUG_WX', expected)
 
diff --git a/scripts/test-openjdk.py b/scripts/test-openjdk.py
index ad9616f..a015426 100755
--- a/scripts/test-openjdk.py
+++ b/scripts/test-openjdk.py
@@ -50,20 +50,14 @@ class OpenJDKTest(testlib.TestlibCase):
         elif arch == "i686":
             arch = "i386"
 
-        if self.lsb_release['Release'] >= 12.04:
-            jdkpath = "/usr/lib/jvm/java-6-openjdk-%s/jre/lib" % arch
-            if jdk == "openjdk-7":
-                jdkpath = "/usr/lib/jvm/java-7-openjdk-%s/jre/lib" % arch
-            elif jdk == "openjdk-8":
-                jdkpath = "/usr/lib/jvm/java-8-openjdk-%s/jre/lib" % arch
-        else:
-            jdkpath = "/usr/lib/jvm/java-6-openjdk/jre/lib"
-            if jdk == "openjdk-7":
-                jdkpath = "/usr/lib/jvm/java-7-openjdk/jre/lib"
-            elif jdk == "openjdk-8":
-                jdkpath = "/usr/lib/jvm/java-8-openjdk-%s/jre/lib" % arch
-
-        self.jdkpath = os.path.join(jdkpath, arch)
+        jdkpaths = {
+            'openjdk-6': "/usr/lib/jvm/java-6-openjdk-%s/jre/lib/%s" % (arch, arch),
+            'openjdk-7': "/usr/lib/jvm/java-7-openjdk-%s/jre/lib/%s" % (arch, arch),
+            'openjdk-8': "/usr/lib/jvm/java-8-openjdk-%s/jre/lib/%s" % (arch, arch),
+            'openjdk-11': "/usr/lib/jvm/java-11-openjdk-%s/lib" % arch
+        }
+
+        self.jdkpath = jdkpaths[jdk]
 
         # 'server' is the default for amd64 and 'client' for i386, but don't
         # list the default here. It will be used when applications are called
@@ -85,12 +79,11 @@ class OpenJDKTest(testlib.TestlibCase):
 
     def test_aa_java_version(self):
         '''Test java version'''
-        rc, report = testlib.cmd(['java', '-version'])
-        expected = 0
-        result = 'Got exit code %d, expected %d\n' % (rc, expected)
-        self.assertTrue(rc == expected, result + report)
-        print("$ java -version\n%s" % report, file=sys.stdout)
-        sys.stdout.flush()
+        report = self.assertShellExitEquals(0, ['java', '-version'], bare_report=True)
+        print("$ java -version\n%s" % report, file=sys.stderr)
+        for vm in self.vms:
+            report = self.assertShellExitEquals(0, ['java', '-%s' % vm, '-version'], bare_report=True)
+            print("$ java -%s -version\n%s" % (vm, report), file=sys.stderr)
 
     def test_eclipse(self):
         '''Test eclipse'''
@@ -190,6 +183,9 @@ class OpenJDKTest(testlib.TestlibCase):
 
         self.assertShellExitEquals(0, ['java', '-jar', jarfile, '-s'])
 
+        for vm in self.vms:
+            self.assertShellExitEquals(0, ['java', '-%s' % vm, '-jar', jarfile, '-s'])
+
     # The yy_* tests should happen last to make sure we see the failures after
     # all the prompted manual tests
     def test_yy_regression_lp1283828(self):
diff --git a/scripts/test-openjdk11.py b/scripts/test-openjdk11.py
new file mode 100755
index 0000000..4cc2b1f
--- /dev/null
+++ b/scripts/test-openjdk11.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+#
+#    test-openjdk8.py quality assurance test script
+#    Copyright (C) 2012-2016 Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 2,
+#    as published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+'''
+  *** IMPORTANT ***
+  DO NOT RUN ON A PRODUCTION SERVER.
+  *** IMPORTANT ***
+'''
+
+# QRT-Depends: testlib_data.py testlib_ssl.py testlib_browser.py test-openjdk.py
+# QRT-Packages: eclipse openjdk-11-jdk openjdk-11-jre-zero chromium-browser firefox eclipse-platform
+# QRT-Alternates: netbeans
+
+from __future__ import print_function
+
+import subprocess
+import sys
+
+if __name__ == '__main__':
+    print('openjdk8 regression tests')
+    prc = subprocess.Popen(['python', 'test-openjdk.py', '--jdk=openjdk-11'],
+                           stdout=sys.stdout,
+                           stderr=subprocess.STDOUT)
+    prc.wait()
+    sys.exit(prc.returncode)