fix workflow test running

Author: xor-bits

.cargo/config.toml

@@ -3,7 +3,7 @@
 # target = "x86_64-unknown-none"
 rustflags = [
     # TODO: remove and implement DWARF info based stack tracing
-    "-C", "force-frame-pointers=true",
+    "-C", "force-frame-pointers=y",
     #"-C", "code-model=kernel",
     #"-C", "relocation-model=static",
     #"-C", "linker=clang-16",

.github/workflows/rust.yml

@@ -12,64 +12,54 @@ env:
 jobs:
 
   unit-tests:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust-version: [nightly-2023-05-15]
+        os: [ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+    
     steps:
     - uses: actions/checkout@v3 
-
-    - name: Rust Cache
+      
+    #- run: apt update # only on ACT
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: jq xorriso qemu-system-x86 ripgrep
+        version: 1.0
+
+    - name: Cache toolchain
+      id: cache-rustup
+      uses: actions/cache@v3
+      with:
+        path: ~/.rustup
+        key: rust-toolchain-${{ matrix.rust-version }}
+
+    - name: Install ${{ matrix.rust-version }}
+      if: ${{ steps.cache-rustup.outputs.cache-hit != 'true' }}
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: ${{ matrix.rust-version }}
+        override: true
+        target: x86_64-unknown-none
+        components: rustfmt, clippy
+
+    - name: Cache Build
       uses: Swatinem/rust-cache@v2.5.0
 
-    - name: install cargo-nextest
-      uses: taiki-e/install-action@nextest
-
-    - name: Hack to ignore kernel from test cargo compiler
-      run: sed -i -e 's/^# \(.*sed_mark_1\)/\1/' Cargo.toml && sed -i -e 's/^\(.*sed_mark_0\)/# \1/' Cargo.toml
-
     - name: Build
-      run: cargo build --verbose
+      run: make build
 
     - name: Run tests
-      run: cargo nextest run --verbose
-
-  kernel-unit-tests:
-    if: false
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3 
-
-    - name: Add x86_64 target
-      run: rustup target add x86_64-unknown-none
+      run: make unittest
 
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2.5.0
-
-    - name: Run qemu tests
+    - name: Run QEMU tests
       run: make test
-    
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3 
-
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2.5.0
-
-    - name: Add Clippy
-      run: rustup component add clippy
 
-    - name: Run clippy
+    - name: Run Clippy
       run: cargo clippy --all -- -D warnings
 
-  rustfmt:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3 
-
-    - name: Rust Cache
-      uses: Swatinem/rust-cache@v2.5.0
-
-    - name: Add Rustfmt
-      run: rustup component add rustfmt
-
-    - name: Run clippy
+    - name: Run Rustfmt
       run: cargo fmt --all -- --check

Makefile

@@ -78,9 +78,20 @@ ${KERNEL_TESTING}: ${KERNEL_SRC} Makefile Cargo.toml Cargo.lock
 # ISO generation
 include ./${BOOT_DIR}/Makefile
 
-# ISO running
+# ISO running (including unit tests in QEMU)
 include ./qemu.mk
 
+# nextest doesn't support excluding packages
+EXCLUDED_UNITS   := sample-elf kernel
+unittest:
+	${CARGO} test \
+		--no-fail-fast \
+		--workspace $(patsubst %, --exclude hyperion-%, ${EXCLUDED_UNITS}) \
+		-- --test-threads=$(shell nproc --all) \
+		2>&1 | rg --pcre2 --multiline --multiline-dotall -e '^test' -e 'failures:.+?(?=\n\n\n)\n\n\n' \
+		2>&1 | rg -v '^test result: '
+# a crazy hack that I somehow came up with to debloat the cargo test --workspace output ^^^
+
 # build alias
 build: ${KERNEL}
 
@@ -109,6 +120,6 @@ src:
 	@echo "from: ${CARGO_DIR}/hyperion.d"
 	@echo "${KERNEL_SRC}" | tr " " "\n" | sort
 
-.PHONY : build iso reset-cargo-deps run test gdb kernel objdump readelf src
+.PHONY : build iso run test unittest gdb kernel objdump readelf src
 
 # end

qemu.mk

@@ -19,11 +19,10 @@ QEMU_FLAGS      += -M smm=off
 endif
 ifeq (${DEBUG},1)
 QEMU_FLAGS      += -d guest_errors
-else (${DEBUG},2)
+else ifeq (${DEBUG},2)
 QEMU_FLAGS      += -d int,guest_errors
-else (${DEBUG},3)
+else ifeq (${DEBUG},3)
 QEMU_FLAGS      += -d int,guest_errors,cpu_reset
-else
 endif
 QEMU_FLAGS      += -no-reboot
 # QEMU_FLAGS      += -no-shutdown