X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.github%2Fworkflows%2Ffunctional_test.sh;h=c17e67dd2be9fffeed180fa89acadaeba6d72ac7;hb=9cda7bc4571fe9a7ef8278b46cc10babe51ce483;hp=7aa5cb8b402526001ee11aedd1dd9b00c034145d;hpb=4b97fce50b144ea7a266cf7bdd5cb6f274cfa32a;p=kconfig-hardened-check.git

diff --git a/.github/workflows/functional_test.sh b/.github/workflows/functional_test.sh
index 7aa5cb8..c17e67d 100644
--- a/.github/workflows/functional_test.sh
+++ b/.github/workflows/functional_test.sh
@@ -40,7 +40,7 @@ coverage run -a --branch bin/kconfig-hardened-check -g ARM
 
 echo ">>>>> check the example kconfig files, cmdline, and sysctl <<<<<"
 cat /proc/cmdline
-echo "l1tf=off mds=full randomize_kstack_offset=on iommu.passthrough=0" > ./cmdline_example
+echo "l1tf=off mds=full mitigations=off randomize_kstack_offset=on retbleed=0 iommu.passthrough=0" > ./cmdline_example
 cat ./cmdline_example
 sysctl -a > /tmp/sysctls
 CONFIG_DIR=`find . -name config_files`
@@ -51,18 +51,25 @@ for C in $KCONFIGS
 do
         COUNT=$(expr $COUNT + 1)
         echo "\n>>>>> checking kconfig number $COUNT <<<<<"
-        coverage run -a --branch bin/kconfig-hardened-check -c $C > /dev/null
+        coverage run -a --branch bin/kconfig-hardened-check -c $C
         coverage run -a --branch bin/kconfig-hardened-check -c $C -m verbose > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -s /tmp/sysctls > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE > /dev/null
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -s /tmp/sysctls
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE
         coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m verbose > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m json > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m show_ok > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m show_fail > /dev/null
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m json
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m show_ok
+        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -s $SYSCTL_EXAMPLE -m show_fail
 done
 echo "\n>>>>> have checked $COUNT kconfigs <<<<<"
 
+echo ">>>>> check sysctl separately <<<<<"
+coverage run -a --branch bin/kconfig-hardened-check -s $SYSCTL_EXAMPLE
+coverage run -a --branch bin/kconfig-hardened-check -s $SYSCTL_EXAMPLE -m verbose > /dev/null
+coverage run -a --branch bin/kconfig-hardened-check -s $SYSCTL_EXAMPLE -m json
+coverage run -a --branch bin/kconfig-hardened-check -s $SYSCTL_EXAMPLE -m show_ok
+coverage run -a --branch bin/kconfig-hardened-check -s $SYSCTL_EXAMPLE -m show_fail
+
 echo "Collect coverage for error handling"
 
 echo ">>>>> -c and -p together <<<<<"
@@ -71,12 +78,18 @@ coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -c kconfig_hardene
 echo ">>>>> -c and -g together <<<<<"
 coverage run -a --branch bin/kconfig-hardened-check -g X86_64 -c kconfig_hardened_check/config_files/distros/fedora_34.config && exit 1
 
-echo ">>>>> -p and -g together <<<<<"
-coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -g X86_64 && exit 1
-
 echo ">>>>> -l without -c <<<<<"
 coverage run -a --branch bin/kconfig-hardened-check -l /proc/cmdline && exit 1
 
+echo ">>>>> -s and -p together <<<<<"
+coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -s $SYSCTL_EXAMPLE && exit 1
+
+echo ">>>>> -s and -g together <<<<<"
+coverage run -a --branch bin/kconfig-hardened-check -g X86_64 -s $SYSCTL_EXAMPLE && exit 1
+
+echo ">>>>> -p and -g together <<<<<"
+coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -g X86_64 && exit 1
+
 echo ">>>>> wrong modes for -p <<<<<"
 coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -m show_ok && exit 1
 coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -m show_fail && exit 1