Skip to content

Commit 625a5a1

Browse files
committed
ch1 with matrix test
1 parent 418f47e commit 625a5a1

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

.github/workflows/doc-and-test.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
arch: [riscv64, aarch64, x86_64, loongarch64]
14+
arch: [riscv64, x86_64, aarch64, loongarch64]
1515
steps:
1616
- uses: actions/checkout@v3
1717
- uses: actions-rs/toolchain@v1
@@ -55,16 +55,9 @@ jobs:
5555
- name: Run usertests in ${{ matrix.arch }}
5656
run: |
5757
cd os
58-
(make run ARCH=${{ matrix.arch }} & echo $! > pidfile) | while IFS= read -r line
59-
do
60-
echo "$line"
61-
if echo "$line" | grep -q "shutdown!"
62-
then
63-
if ps -p $(cat pidfile) > /dev/null
64-
then
65-
kill $(cat pidfile)
66-
fi
67-
exit 0
68-
fi
69-
done
70-
timeout-minutes: 4
58+
timeout 60 make run ARCH=${{ matrix.arch }} 2>&1 | tee output.log || echo "qemu exited"
59+
timeout-minutes: 2
60+
61+
- name: Checkout output
62+
run : |
63+
grep -q "[kernel] Hello, world!" os/output.log && exit 1 || exit 0

0 commit comments

Comments
 (0)