diff options
author | Marvin Borner | 2021-03-13 18:42:08 +0100 |
---|---|---|
committer | Marvin Borner | 2021-03-14 11:36:19 +0100 |
commit | 2f8328f2a41b77eea297ee7fc28818331d4e6c54 (patch) | |
tree | 502a32873437b2da5cdf82f90be9f87c87cbf33f /run | |
parent | 07ef0caa840db2ee423835ee063b96a1d1993468 (diff) |
Fixed workflow
Diffstat (limited to 'run')
-rwxr-xr-x | run | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -126,7 +126,7 @@ make_build() { $SUDO dd if=build/boot.bin of=/dev/${VND}i conv=notrunc status=none else - $SUDO mke2fs -q build/disk.img + $SUDO mke2fs -b 1024 -q build/disk.img dd if=build/boot.bin of=build/disk.img conv=notrunc status=none fi @@ -158,10 +158,10 @@ make_build() { make_test() { if [ "$mode" = "test" ]; then - qemu_with_flags -nographic -drive file=build/disk.img,format=raw,index=1,media=disk - #echo - #grep -E 'PASS|FAIL' test.log - #if grep -q "All tests passed" test.log; then exit 0; else exit 1; fi + qemu_with_flags -serial file:test.log -nographic -drive file=build/disk.img,format=raw,index=1,media=disk + echo + grep -E 'PASS|FAIL' test.log + if grep -q "All tests passed" test.log; then exit 0; else exit 1; fi else qemu_with_flags -serial stdio -drive file=build/disk.img,format=raw,index=1,media=disk fi |