Skip to content

Commit

Permalink
[build] E: Test
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafael0121
rafael0121 committed Oct 11, 2024
1 parent d1fbb04 commit 80be9cd
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 35 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/x86-debug.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=microvm clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=microvm clippy
build:
name: Build
Expand All @@ -61,12 +61,12 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=microvm all
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all
make TARGET=x86 LOG_LEVEL=trace MACHINE=microvm all
test-qemu-isapc:
name: Test (qemu-isapc)
Expand All @@ -82,7 +82,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all run | tee output.txt
make TIMEOUT=5 TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -100,7 +100,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all run | tee output.txt
make TIMEOUT=5 TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -118,7 +118,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all run | tee output.txt
make TIMEOUT=5 TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -136,7 +136,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all run | tee output.txt
make TIMEOUT=5 TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -154,7 +154,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-debug
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all run | tee output.txt
make TIMEOUT=5 TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/x86-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp clippy
make TOOLCHAIN_DIR=$HOME/toolchain TARGET=x86 LOG_LEVEL=trace MACHINE=microvm clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp clippy
make TARGET=x86 LOG_LEVEL=trace MACHINE=microvm clippy
build:
name: Build
Expand All @@ -61,12 +61,12 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-isapc
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-pc
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-baremetal
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-pc-smp
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-baremetal-smp
make TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=microvm
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-isapc
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-pc
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-baremetal
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-pc-smp
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=qemu-baremetal-smp
make RELEASE=yes TARGET=x86 LOG_LEVEL=trace all MACHINE=microvm
test-qemu-isapc:
name: Test (qemu-isapc)
Expand All @@ -82,7 +82,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all run | tee output.txt
make TIMEOUT=5 RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-isapc all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -100,7 +100,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all run | tee output.txt
make TIMEOUT=5 RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -118,7 +118,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all run | tee output.txt
make TIMEOUT=5 RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -136,7 +136,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all run | tee output.txt
make TIMEOUT=5 RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-pc-smp all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand All @@ -154,7 +154,7 @@ jobs:
port: ${{ secrets.portnum }}
script: |
cd kernel-release
make TIMEOUT=5 TOOLCHAIN_DIR=$HOME/toolchain RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all run | tee output.txt
make TIMEOUT=5 RELEASE=yes TARGET=x86 LOG_LEVEL=trace MACHINE=qemu-baremetal-smp all run | tee output.txt
echo "Magic String: $(cat output.txt | tail -n 1)"
[ "$(cat output.txt | tail -n 1)" != "[DEBUG][kernel] hello, world!" ] && exit 1 || exit 0 ;
Expand Down
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ export TOOLCHAIN_DIR ?= $(ROOT_DIR)/toolchain
export CARGO := $(HOME)/.cargo/bin/cargo
export RUSTC := $(HOME)/.cargo/bin/rustc

# Microvm path
export MICROVM_PATH ?= $(BINARIES_DIR)/microvm.elf

#===============================================================================
# Build Artifacts
#===============================================================================
Expand Down
2 changes: 1 addition & 1 deletion build
Submodule build updated 4 files
+1 −1 scripts/run.sh
+0 −61 scripts/setup/qemu.sh
+0 −142 scripts/setup/toolchain.sh
+1 −0 scripts/setup/ubuntu.sh

0 comments on commit 80be9cd

Please sign in to comment.