X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.github%2Fworkflows%2Fmain.yml;h=2ccf6f2ae543181bc4c4e566e4d041cdead1ebd4;hb=4444990311f188c65b7c48d66a5f346e39d33f63;hp=70a0be583c1956bcf83335714b3ec842d9c9b754;hpb=e3503e95d12774be3d7ac2d555d65e8499a79881;p=kconfig-hardened-check.git

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 70a0be5..2ccf6f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -87,6 +87,7 @@ jobs:
         do
                 COUNT=$(expr $COUNT + 1)
                 echo -e "\n>>>>> checking config number $COUNT <<<<<"
+                coverage run -a --branch bin/kconfig-hardened-check -c $C
                 coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline
                 coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m verbose > /dev/null
                 coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m json
@@ -94,14 +95,62 @@ jobs:
                 coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m show_fail
         done
         echo -e "\n>>>>> checking $COUNT configs is done <<<<<"
+
+    - name: Collect coverage for error handling
+      run: |
+        echo ">>>>> lonely -l <<<<<"
+        ! coverage run -a --branch bin/kconfig-hardened-check -l /proc/cmdline
+
+        echo ">>>>> wrong modes for -p  <<<<<"
+        ! coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -m show_ok
+        ! coverage run -a --branch bin/kconfig-hardened-check -p X86_64 -m show_fail
+
+        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
+
+        cp kconfig_hardened_check/config_files/distros/fedora_34.config ./test.config
+
+        echo ">>>>> no kernel version <<<<<"
+        sed '3d' test.config > error.config
+        ! coverage run -a --branch bin/kconfig-hardened-check -c error.config
+
+        echo ">>>>> strange kernel version string <<<<<"
+        sed  '3 s/5./version 5./' test.config > error.config
+        ! coverage run -a --branch bin/kconfig-hardened-check -c error.config
+
+        echo ">>>>> no arch <<<<<"
+        sed  '305d' test.config > error.config
+        ! coverage run -a --branch bin/kconfig-hardened-check -c error.config
+
+        echo ">>>>> more than one arch <<<<<"
+        cp test.config error.config
+        echo  'CONFIG_ARM64=y' >> error.config
+        ! coverage run -a --branch bin/kconfig-hardened-check -c error.config
+
+        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
+
+        echo ">>>>> one config option multiple times <<<<<"
+        cp test.config error.config
+        echo  'CONFIG_BUG=y' >> error.config
+        ! coverage run -a --branch bin/kconfig-hardened-check -c error.config
+
+        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
+
+    - name: Prepare final coverage report
+      run: |
         coverage xml -i -o coverage.xml
 
     - name: Handle coverage
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
       with:
         file: ./coverage.xml
         flags: functional_test
         name: codecov-umbrella
         fail_ci_if_error: true
-
+        verbose: true