From 89403f1494ded841c5e0ddbf2af028cb50b37f28 Mon Sep 17 00:00:00 2001
From: Brian Ginsbach <brian.ginsbach@gmail.com>
Date: Tue, 14 Apr 2020 10:49:40 -0500
Subject: Multiple platform support in Register

Support specifying multiple platforms with `--platform`. Useful as
not all operating systems identify identical hardware (platforms)
with the same name (example x86_64 and amd64).
---
 include/functions | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/functions b/include/functions
index c88674ba..2bb82eae 100644
--- a/include/functions
+++ b/include/functions
@@ -2670,7 +2670,15 @@
         fi
 
         # Check for correct hardware platform
-        if [ ${SKIPTEST} -eq 0 -a -n "${TEST_NEED_PLATFORM}" -a ! "${HARDWARE}" = "${TEST_NEED_PLATFORM}" ]; then SKIPTEST=1; SKIPREASON="Incorrect hardware platform"; fi
+        if [ ${SKIPTEST} -eq 0 -a -n "${TEST_NEED_PLATFORM}" ]; then
+            HASMATCH=0
+            for I in ${TEST_NEED_PLATFORM}; do
+                if [ "${I}" = "${HARDWARE}" ]; then HASMATCH=1; fi
+            done
+            if [ ${HASMATCH} -eq 0 ]; then
+                SKIPTEST=1; SKIPREASON="Incorrect hardware platform (${TEST_NEED_PLATFORM} only)"
+            fi
+        fi
 
         # Check for required (and discovered) package manager
         if [ ${SKIPTEST} -eq 0 -a ${TEST_NEED_PKG_MGR} -eq 1 -a ${HAS_PACKAGE_MANAGER} -eq 0 ]; then SKIPTEST=1; SKIPREASON="Requires a known package manager to test presence of a particular package"; fi
-- 
cgit v1.2.3


From 7292f0f179d1fce59c9412349161f71a74e53c88 Mon Sep 17 00:00:00 2001
From: Brian Ginsbach <brian.ginsbach@gmail.com>
Date: Tue, 14 Apr 2020 11:08:49 -0500
Subject: KRNL-5677 add NetBSD

It is possible that NetBSD has the `proc` filesystem mounted. When
`/proc` is mounted there will be a `/proc/cpuinfo`. Handle the simple
case first (`proc` filesystem mounted). There are multiple other means
to determine PAE/NX without `/proc/cpuinfo`.
---
 include/tests_kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tests_kernel b/include/tests_kernel
index 119b276e..75f7bffc 100644
--- a/include/tests_kernel
+++ b/include/tests_kernel
@@ -103,7 +103,7 @@
     # Description : Check CPU options and support (PAE, No eXecute, eXecute Disable)
     # More info   : pae and nx bit are both visible on AMD and Intel CPU's if supported
 
-    Register --test-no KRNL-5677 --platform x86_64 --os Linux --weight L --network NO --category security --description "Check CPU options and support"
+    Register --test-no KRNL-5677 --platform "x86_64 amd64" --os "Linux NetBSD" --weight L --network NO --category security --description "Check CPU options and support"
     if [ ${SKIPTEST} -eq 0 ]; then
         Display --indent 2 --text "- Checking CPU support (NX/PAE)"
         LogText "Test: Checking /proc/cpuinfo"
-- 
cgit v1.2.3