From 0b1e4597e338f2e7085aae2e2de08cf86314e3e2 Mon Sep 17 00:00:00 2001
From: Matus Marhefka <mmarhefk@redhat.com>
Date: Dec 01 2020 13:06:36 +0000
Subject: Sanity/smoke-test: autowaive hugepages issue on ppc64


---

diff --git a/Sanity/smoke-test/Makefile b/Sanity/smoke-test/Makefile
index 9609c92..ac1d5b4 100644
--- a/Sanity/smoke-test/Makefile
+++ b/Sanity/smoke-test/Makefile
@@ -29,7 +29,7 @@ export TESTVERSION=1.1
 
 BUILT_FILES=
 
-FILES=$(METADATA) runtest.sh Makefile PURPOSE fix_hugepages_err.patch
+FILES=$(METADATA) runtest.sh Makefile PURPOSE fix_hugepages_err.patch fix_hugepages_err7.patch
 
 .PHONY: all install download clean
 
diff --git a/Sanity/smoke-test/fix_hugepages_err.patch b/Sanity/smoke-test/fix_hugepages_err.patch
index 4ca95ee..fae2a18 100644
--- a/Sanity/smoke-test/fix_hugepages_err.patch
+++ b/Sanity/smoke-test/fix_hugepages_err.patch
@@ -5,7 +5,7 @@ index 732d22ec1..119e92c33 100755
 @@ -69,6 +69,7 @@ diff "$sysctlNames" "$ourNames"
  
  # remove oscap error message related to permissions from stderr
- sed -i -E "/^E: lt-probe_sysctl: Can't read sysctl value from /d" "$stderr"
+ sed -i -E "/^E: oscap: +Can't read sysctl value from /d" "$stderr"
 +sed -i "/^.*hugepages.*$/d" "$stderr"
  [ ! -s $stderr ]
  
diff --git a/Sanity/smoke-test/fix_hugepages_err7.patch b/Sanity/smoke-test/fix_hugepages_err7.patch
new file mode 100644
index 0000000..4ca95ee
--- /dev/null
+++ b/Sanity/smoke-test/fix_hugepages_err7.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/probes/sysctl/test_sysctl_probe_all.sh b/tests/probes/sysctl/test_sysctl_probe_all.sh
+index 732d22ec1..119e92c33 100755
+--- a/tests/probes/sysctl/test_sysctl_probe_all.sh
++++ b/tests/probes/sysctl/test_sysctl_probe_all.sh
+@@ -69,6 +69,7 @@ diff "$sysctlNames" "$ourNames"
+ 
+ # remove oscap error message related to permissions from stderr
+ sed -i -E "/^E: lt-probe_sysctl: Can't read sysctl value from /d" "$stderr"
++sed -i "/^.*hugepages.*$/d" "$stderr"
+ [ ! -s $stderr ]
+ 
+ rm $stderr $result $ourNames $sysctlNames
diff --git a/Sanity/smoke-test/runtest.sh b/Sanity/smoke-test/runtest.sh
index beab24c..bd3da95 100755
--- a/Sanity/smoke-test/runtest.sh
+++ b/Sanity/smoke-test/runtest.sh
@@ -40,7 +40,7 @@ rlJournalStart
         CleanupRegister "RpmSnapshotRevert"
         rlRun "TmpDir=\$(mktemp -d)" 0
         CleanupRegister "rlRun 'rm -r $TmpDir' 0 'Removing tmp directory'"
-        rlRun "cp fix_hugepages_err.patch $TmpDir"
+        rlRun "cp fix_hugepages_err7.patch fix_hugepages_err.patch $TmpDir"
         rlRun "pushd $TmpDir"
         CleanupRegister "rlRun 'popd'"
         rlServiceStart sendmail
@@ -79,17 +79,21 @@ rlJournalStart
         CleanupRegister "rlRun 'rm -rf ${TOPDIR}/BUILD/${PACKAGE}*'"
         CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SPECS/${PACKAGE}*'"
         CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SOURCES/*'"
+
+        rlLogInfo "Waive the known issue with hugepages on ppc64/ppc64le"
+        rlLogInfo "platforms which won't be fixed:"
+        rlLogInfo "https://bugzilla.redhat.com/show_bug.cgi?id=1607382"
+        TEST_CWD=$(pwd)
+        TREE_CWD=$(readlink -f ${TOPDIR}/BUILD/${PACKAGE}*)
         if rlIsRHEL 7; then
-            rlLogInfo "Waive the known issue with hugepages on ppc64/ppc64le"
-            rlLogInfo "platforms which won't be fixed in RHEL7:"
-            rlLogInfo "https://bugzilla.redhat.com/show_bug.cgi?id=1607382"
-            TEST_CWD=$(pwd)
-            TREE_CWD=$(readlink -f ${TOPDIR}/BUILD/${PACKAGE}*)
-            rlRun "cp fix_hugepages_err.patch $TREE_CWD"
-            rlRun "cd $TREE_CWD"
-            rlRun "patch -p1 < fix_hugepages_err.patch"
-            rlRun "cd $TEST_CWD" 0 "Restore test default working directory"
+            HUGEPAGES_PATCH="fix_hugepages_err7.patch"
+        else
+            HUGEPAGES_PATCH="fix_hugepages_err.patch"
         fi
+        rlRun "cp $HUGEPAGES_PATCH $TREE_CWD"
+        rlRun "cd $TREE_CWD"
+        rlRun "patch -p1 < $HUGEPAGES_PATCH"
+        rlRun "cd $TEST_CWD" 0 "Restore test default working directory"
     rlPhaseEnd
 
     rlPhaseStartTest "Run upstream test suite against installed $PACKAGE"