ci: need buildroot to use dash to avoid CLI linewraps

LabNConsulting · May 17, 2024 · 725aeaf · 725aeaf
1 parent e63896f
commit 725aeaf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -273,38 +273,43 @@ jobs:
           mkdir -p test-logs
 
       - name: Print the environment under sudo
-        run: sudo -E env
+        run: |
+          sudo -E env
+          qemu-system-x86_64 --version
+          munet --version
 
       - name: Config test
         run: |
           set -e
+          set -o pipefail
           tmpf=test-logs/results-config.txt
-          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/config | tee $tmpf
-          grep -v SKIPPED $tmpf
+          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/config |& tee $tmpf
+          grep -qvz SKIPPED $tmpf
 
       - name: Errors test
         run: |
           set -e
+          set -o pipefail
           tmpf=test-logs/results-errors.txt
-          tmpf=/tmp/test-results-$$.txt
-          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/errors | tee $tmpf
-          grep -v SKIPPED $tmpf
+          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/errors |& tee $tmpf
+          grep -qvz SKIPPED $tmpf
 
       - name: Simple test
         run: |
           set -e
+          set -o pipefail
           tmpf=test-logs/results-simplenet.txt
-          tmpf=/tmp/test-results-$$.txt
-          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/simplenet | tee $tmpf
-          grep -v SKIPPED $tmpf
+          sudo -E env CI=$CI python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/simplenet |& tee $tmpf
+          grep -qvz SKIPPED $tmpf
 
       # Restore longer running test once working
       - name: UT packet test
         run: |
           set -e
+          set -o pipefail
           tmpf=test-logs/results-utpkt.txt
-          sudo python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/utpkt | tee $tmpf
-          grep -v SKIPPED $tmpf
+          sudo python3 -m pytest -s --coverage --cov-build-dir=$PWD/output-linux tests/utpkt |& tee $tmpf
+          grep -qvz SKIPPED $tmpf
 
       - name: Extract coverage data
         if: ${{ always() }}

diff --git a/buildroot-ci.config b/buildroot-ci.config
@@ -414,12 +414,13 @@ BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt"
 # BR2_ROOTFS_MERGED_USR is not set
 BR2_TARGET_ENABLE_ROOT_LOGIN=y
 BR2_TARGET_GENERIC_ROOT_PASSWD=""
-BR2_SYSTEM_BIN_SH_BUSYBOX=y
+# BR2_SYSTEM_BIN_SH_BUSYBOX is not set
 # BR2_SYSTEM_BIN_SH_BASH is not set
-# BR2_SYSTEM_BIN_SH_DASH is not set
+BR2_SYSTEM_BIN_SH_DASH=y
 # BR2_SYSTEM_BIN_SH_MKSH is not set
 # BR2_SYSTEM_BIN_SH_ZSH is not set
 # BR2_SYSTEM_BIN_SH_NONE is not set
+BR2_SYSTEM_BIN_SH="dash"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="console"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP=y
@@ -2610,7 +2611,7 @@ BR2_PACKAGE_URANDOM_SCRIPTS=y
 # Shells
 #
 # BR2_PACKAGE_BASH is not set
-# BR2_PACKAGE_DASH is not set
+BR2_PACKAGE_DASH=y
 # BR2_PACKAGE_MKSH is not set
 # BR2_PACKAGE_NUSHELL is not set
 # BR2_PACKAGE_ZSH is not set