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

diff --git a/.github/workflows/functional_test.sh b/.github/workflows/functional_test.sh
index cf613c7..7aa5cb8 100644
--- a/.github/workflows/functional_test.sh
+++ b/.github/workflows/functional_test.sh
@@ -3,6 +3,9 @@
 set -x
 set -e
 
+git status
+git show -s
+
 echo "Beginning of the functional tests"
 
 echo ">>>>> get help <<<<<"
@@ -35,11 +38,13 @@ coverage run -a --branch bin/kconfig-hardened-check -g X86_32
 coverage run -a --branch bin/kconfig-hardened-check -g ARM64
 coverage run -a --branch bin/kconfig-hardened-check -g ARM
 
-echo ">>>>> check the example kconfig files and cmdline <<<<<"
+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
 cat ./cmdline_example
+sysctl -a > /tmp/sysctls
 CONFIG_DIR=`find . -name config_files`
+SYSCTL_EXAMPLE=$CONFIG_DIR/distros/example_sysctls.txt
 KCONFIGS=`find $CONFIG_DIR -type f | grep -e "\.config" -e "\.gz"`
 COUNT=0
 for C in $KCONFIGS
@@ -49,31 +54,36 @@ do
         coverage run -a --branch bin/kconfig-hardened-check -c $C > /dev/null
         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 -l ./cmdline_example > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m verbose > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m json > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m show_ok > /dev/null
-        coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m show_fail > /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 ./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
 done
 echo "\n>>>>> have checked $COUNT kconfigs <<<<<"
 
 echo "Collect coverage for error handling"
-echo ">>>>> lonely -l <<<<<"
+
+echo ">>>>> -c and -p together <<<<<"
+coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -c kconfig_hardened_check/config_files/distros/fedora_34.config && exit 1
+
+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 ">>>>> 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
 
-echo ">>>>> -p and -c together <<<<<"
-coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -c kconfig_hardened_check/config_files/distros/fedora_34.config && exit 1
-
 echo ">>>>> wrong mode for -g <<<<<"
 coverage run -a --branch bin/kconfig-hardened-check -g X86_64 -m show_ok && exit 1
 
-echo ">>>>> -g and -c together <<<<<"
-coverage run -a --branch bin/kconfig-hardened-check -g X86_64 -c kconfig_hardened_check/config_files/distros/fedora_34.config && exit 1
-
 cp kconfig_hardened_check/config_files/distros/fedora_34.config ./test.config
 
 echo ">>>>> no kernel version <<<<<"
@@ -93,10 +103,6 @@ cp test.config error.config
 echo 'CONFIG_ARM64=y' >> error.config
 coverage run -a --branch bin/kconfig-hardened-check -c error.config && exit 1
 
-echo ">>>>> invalid disabled kconfig option <<<<<"
-sed '28 s/is not set/is not set yet/' test.config > error.config
-coverage run -a --branch bin/kconfig-hardened-check -c error.config && exit 1
-
 echo ">>>>> invalid enabled kconfig option <<<<<"
 cp test.config error.config
 echo 'CONFIG_FOO=is not set' >> error.config
@@ -112,9 +118,23 @@ cp test.config error.config
 sed '8 s/CONFIG_CLANG_VERSION=0/CONFIG_CLANG_VERSION=120000/' test.config > error.config
 coverage run -a --branch bin/kconfig-hardened-check -c error.config && exit 1
 
+echo ">>>>> unexpected line in the kconfig file <<<<<"
+cp test.config error.config
+echo 'some strange line' >> error.config
+coverage run -a --branch bin/kconfig-hardened-check -c error.config && exit 1
+
 echo ">>>>> multi-line cmdline file <<<<<"
 echo 'hey man 1' > cmdline
 echo 'hey man 2' >> cmdline
 coverage run -a --branch bin/kconfig-hardened-check -c test.config -l cmdline && exit 1
 
+echo ">>>>> unexpected line in the sysctl file <<<<<"
+cp $SYSCTL_EXAMPLE error_sysctls
+echo 'some strange line' >> error_sysctls
+coverage run -a --branch bin/kconfig-hardened-check -c test.config -s error_sysctls && exit 1
+
+echo ">>>>> invalid sysctl file <<<<<"
+touch empty_file
+coverage run -a --branch bin/kconfig-hardened-check -c test.config -s empty_file && exit 1
+
 echo "The end of the functional tests"