ubuntu-bugcontrol team mailing list archive

[Tobin Davis <gruemaster@xxxxxxxxx>]

Tobin Davis has proposed merging lp:~gruemaster/qa-regression-testing/armel into lp:qa-regression-testing.

Requested reviews:
  Ubuntu Bug Control (ubuntu-bugcontrol)

For more details, see:
https://code.launchpad.net/~gruemaster/qa-regression-testing/armel/+merge/86169

Added armhf to the test-kernel-security.py script as an additional architecture.
-- 
https://code.launchpad.net/~gruemaster/qa-regression-testing/armel/+merge/86169
Your team Ubuntu Bug Control is requested to review the proposed merge of lp:~gruemaster/qa-regression-testing/armel into lp:qa-regression-testing.

=== modified file 'scripts/test-kernel-security.py'
--- scripts/test-kernel-security.py	2011-12-09 23:56:08 +0000
+++ scripts/test-kernel-security.py	2011-12-18 16:36:24 +0000
@@ -62,9 +62,11 @@
         self.fs_dir = os.path.abspath('.')
         os.chdir('kernel-security')
 
+        self.arm_archs = ['armel','armhf']
+
         self.aslr_archs = ['i386','amd64']
         if self.kernel_at_least('2.6.35'):
-            self.aslr_archs += ['armel']
+            self.aslr_archs += ['armel','armhf']
 
         self.seccomp_filter_archs = [ ]
         if self.kernel_at_least('3.0'):
@@ -181,7 +183,7 @@
         else:
             # Arch-specific
             if self.dpkg_arch not in self.aslr_archs:
-                self._skipped("only x86 (and armel 10.10 and later")
+                self._skipped("only x86 (and arm 10.10 and later")
                 expected = 1
 
         self._test_aslr('libs', expected)
@@ -197,7 +199,7 @@
         else:
             # Arch-specific
             if self.dpkg_arch not in self.aslr_archs:
-                self._skipped("only x86 (and armel 10.10 and later)")
+                self._skipped("only x86 (and arm 10.10 and later)")
                 expected = 1
 
         self._test_aslr('text', expected)
@@ -228,7 +230,7 @@
         else:
             # Arch-specific
             if self.dpkg_arch not in self.aslr_archs:
-                self._skipped("only x86 (and armel after 10.04)")
+                self._skipped("only x86 (and arm after 10.04)")
                 expected = 1
 
         self._test_aslr('brk', expected)
@@ -238,7 +240,7 @@
         '''Low memory allocation respects mmap_min_addr'''
 
         wanted = 65536
-        if self.dpkg_arch == 'armel' and \
+        if self.dpkg_arch in self.arm_archs and \
            not self.kernel_version.endswith('-omap'):
             wanted = 32768
         self.announce("%d" % (wanted))
@@ -281,7 +283,8 @@
             self._skipped("only Gutsy and later")
             expected = False
         else:
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.31'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.31'):
                 self._skipped("on ARM only Lucid and later")
                 expected = False
         self.assertEquals(os.path.exists('/sys/kernel/security/apparmor'), expected)
@@ -295,7 +298,8 @@
             self._skipped("only Hardy and later")
             expected = 10
         else:
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.35'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.35'):
                 self._skipped("not available on ARM")
                 expected = 10
             if self.kernel_version.endswith('-ec2') or self.kernel_version.endswith('-virtual') or self.kernel_version.endswith('-xen'):
@@ -394,7 +398,7 @@
             self.assertEquals(rc,0,"Got %d (expected %d):\n%s" % (rc, 0, output))
             expected = '00000000'
             # ARM sets ADDR_LIMIT_32BIT
-            if self.dpkg_arch == 'armel':
+            if self.dpkg_arch in self.arm_archs:
                 expected = '00800000'
 
             output = output.strip()
@@ -524,7 +528,8 @@
         '''CONFIG_SECCOMP enabled'''
 
         expected = 'y'
-        if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.38'):
+        if self.dpkg_arch in self.arm_archs and \
+           not self.kernel_at_least('2.6.38'):
             expected = None
             self._skipped("ignored ARM before 2.6.38")
         self.assertEqual(self._get_config('SECCOMP'), expected)
@@ -545,7 +550,8 @@
     def test_070_config_security_selinux(self):
         '''CONFIG_SECURITY_SELINUX enabled'''
         expected = 'y'
-        if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.31'):
+        if self.dpkg_arch in self.arm_archs and \
+           not self.kernel_at_least('2.6.31'):
             self._skipped("on ARM only Lucid and later")
             expected = False
         self.assertEqual(self._get_config('SECURITY_SELINUX'), expected)
@@ -559,7 +565,8 @@
             self._skipped("only Dapper and later")
             expected = None
         else:
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.36'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.36'):
                 self._skipped("not available on ARM")
                 expected = None
         self.assertEqual(self._get_config('SECCOMP'), expected)
@@ -638,10 +645,11 @@
                 self._skipped("only Hardy and later")
         else:
             # Arch-specific
-            if self.dpkg_arch not in ['i386','amd64','armel']:
+            if self.dpkg_arch not in ['i386','amd64','armel','armhf']:
                 self._skipped("x86 and ARM only")
                 strict = False
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.38'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.38'):
                 self._skipped("only 2.6.38 and later for ARM")
                 strict = False
 
@@ -668,10 +676,11 @@
             expected = [5]
         else:
             # Arch-specific
-            if self.dpkg_arch not in ['i386','amd64','armel']:
+            if self.dpkg_arch not in ['i386','amd64','armel','armhf']:
                 self._skipped("x86 and ARM only")
                 expected = [5]
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.38'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.38'):
                 self._skipped("only 2.6.38 and later for ARM")
                 expected = [4]
             # Xen and EC2 are weird. -virtual seems okay, though
@@ -729,7 +738,7 @@
 
         # Min expectation, based on architecture
         expected = '65536'
-        if self.dpkg_arch == 'armel' and \
+        if self.dpkg_arch in self.arm_archs and \
            not self.kernel_version.endswith('-omap'):
             expected = '32768'
         if self.lsb_release['Release'] == 9.10 and self.kernel_version.endswith('-ec2'):
@@ -767,7 +776,8 @@
                 self._skipped("only Hardy amd64 or Karmic and later")
                 expected = None
         else:
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.35'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.35'):
                 self._skipped("not available on ARM before 10.10")
                 expected = None
             if self.lsb_release['Release'] == 9.10 and self.kernel_version.endswith('-ec2'):
@@ -785,7 +795,8 @@
             self._skipped("only Karmic and later")
             expected = False
         else:
-            if self.dpkg_arch == 'armel' and not self.kernel_at_least('2.6.35'):
+            if self.dpkg_arch in self.arm_archs and \
+               not self.kernel_at_least('2.6.35'):
                 self._skipped("not available on ARM before 10.10")
                 expected = False
             if self.lsb_release['Release'] == 9.10 and self.kernel_version.endswith('-ec2'):