X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.github%2Fworkflows%2Fmain.yml;h=eb1a8dda2ccb9f904f4f45b0902bf588e475aa5c;hb=f08db00f97baf8004863be191c89285ad6c333f5;hp=00640dfdcca176a008af18db94d6f57575a3b596;hpb=dc925368f53175636645ade2d21341ec9b2475d0;p=kconfig-hardened-check.git

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00640df..eb1a8dd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      max-parallel: 4
+      max-parallel: 3
       fail-fast: false
       matrix:
         # Current ubuntu-latest (Ubuntu 22.04) provides the following versions of Python:
@@ -37,13 +37,13 @@ jobs:
       run: |
         echo ">>>>> check all configs <<<<<"
         CONFIG_DIR=`find /opt/hostedtoolcache/Python/ -name config_files`
-        CONFIGS=`find $CONFIG_DIR -type f | grep "\.config"`
+        KCONFIGS=`find $CONFIG_DIR -type f | grep "\.config"`
         COUNT=0
-        for C in $CONFIGS
+        for C in $KCONFIGS
         do
                 COUNT=$(expr $COUNT + 1)
                 echo -e "\n>>>>> checking config number $COUNT <<<<<"
-                kconfig-hardened-check -c $C
+                kconfig-hardened-check -c $C -l /proc/cmdline
         done
         echo -e "\n>>>>> checking $COUNT configs is done <<<<<"
 
@@ -76,24 +76,25 @@ jobs:
         coverage run -a --branch bin/kconfig-hardened-check -p ARM -m verbose
         coverage run -a --branch bin/kconfig-hardened-check -p ARM -m json
 
-        echo ">>>>> use local cmdline as an example <<<<<"
-        cat /proc/cmdline
-
         echo ">>>>> check the example kconfig files and cmdline <<<<<"
+        cat /proc/cmdline
+        echo "l1tf=off mds=full randomize_kstack_offset=on iommu.passthrough=0" > ./cmdline_example
+        cat ./cmdline_example
         CONFIG_DIR=`find . -name config_files`
-        CONFIGS=`find $CONFIG_DIR -type f | grep "\.config"`
+        KCONFIGS=`find $CONFIG_DIR -type f | grep "\.config"`
         COUNT=0
-        for C in $CONFIGS
+        for C in $KCONFIGS
         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 -m verbose > /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 -l /proc/cmdline -m verbose > /dev/null
-                coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m json
-                coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m show_ok
-                coverage run -a --branch bin/kconfig-hardened-check -c $C -l /proc/cmdline -m show_fail
+                coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example
+                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
+                coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m show_ok
+                coverage run -a --branch bin/kconfig-hardened-check -c $C -l ./cmdline_example -m show_fail
         done
         echo -e "\n>>>>> checking $COUNT configs is done <<<<<"
 
@@ -165,3 +166,12 @@ jobs:
         fail_ci_if_error: true
         verbose: true
 
+    - name: Erase coverage
+      run: |
+        coverage erase
+        rm ./coverage.xml
+
+    - name: Run unit-tests and collect coverage
+      run: |
+        coverage run --include=kconfig_hardened_check/engine.py,kconfig_hardened_check/test_engine.py -m unittest -v
+        coverage xml -i -o coverage_unittest.xml