diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | src/tests/ktests/run_qemu_test.sh | 2 | ||||
| -rwxr-xr-x | src/tests/utests/run_qemu_test.sh | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -30,10 +30,10 @@ cdrom.iso: all ./make_cdrom.sh run_qemu: cdrom.iso - qemu-system-i386 -cdrom cdrom.iso -serial stdio -m 16 + qemu-system-i386 -cdrom cdrom.iso -serial stdio -m 64 run_qemu_debug: cdrom.iso - qemu-system-i386 -cdrom cdrom.iso -serial stdio -s -S & \ + qemu-system-i386 -cdrom cdrom.iso -serial stdio -m 64 -s -S & \ (sleep 0.1; gdb src/kernel/kernel.bin -x gdb_cmd) run_bochs_debug: cdrom.iso diff --git a/src/tests/ktests/run_qemu_test.sh b/src/tests/ktests/run_qemu_test.sh index 0e7b83e..3f5c934 100755 --- a/src/tests/ktests/run_qemu_test.sh +++ b/src/tests/ktests/run_qemu_test.sh @@ -1,6 +1,6 @@ #!/bin/bash -(qemu-system-i386 -kernel test_kernel.bin -initrd ../../kernel/kernel.map -serial stdio -m 16 -display none & echo $! >pid) \ +(qemu-system-i386 -kernel test_kernel.bin -initrd ../../kernel/kernel.map -serial stdio -m 64 -display none & echo $! >pid) \ | tee >(grep -m 1 "TEST-" >result; kill -INT `cat pid`) \ RESULT=`cat result` diff --git a/src/tests/utests/run_qemu_test.sh b/src/tests/utests/run_qemu_test.sh index c168e8c..a1f804d 100755 --- a/src/tests/utests/run_qemu_test.sh +++ b/src/tests/utests/run_qemu_test.sh @@ -9,7 +9,7 @@ if [ "$1" = "watchdog" ]; then exit 0 fi -(qemu-system-i386 -kernel ../../../kernel/kernel.bin -append 'init=io:/mod/init.bin' -initrd 'init.bin,../../../kernel/kernel.map' -serial stdio -m 16 -display none & echo $! >pid & +(qemu-system-i386 -kernel ../../../kernel/kernel.bin -append 'init=io:/mod/init.bin' -initrd 'init.bin,../../../kernel/kernel.map' -serial stdio -m 64 -display none & echo $! >pid & $0 watchdog) \ | tee >(grep -m 1 "TEST-" >result; kill -INT `cat pid`; kill -TERM `cat pid2`) \ |