diff options
| author | Alex Auvolat <alex@adnab.me> | 2015-03-14 14:17:03 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2015-03-14 14:17:03 +0100 |
| commit | 4672f514591f0f7110103c4cd898909aef95b635 (patch) | |
| tree | 59a7edc5fd7b1c9c567ada4ec74afe1ed30d5d15 /src/tests | |
| parent | f811e0126639c3cc14c285f2e2093d0df1b556af (diff) | |
| download | kogata-4672f514591f0f7110103c4cd898909aef95b635.tar.gz kogata-4672f514591f0f7110103c4cd898909aef95b635.zip | |
Fix region allocator (see changes in region.c!) ; debug spam control.
Diffstat (limited to 'src/tests')
| -rwxr-xr-x | src/tests/ktests/run_qemu_test.sh | 2 | ||||
| -rwxr-xr-x | src/tests/utests/run_qemu_test.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/ktests/run_qemu_test.sh b/src/tests/ktests/run_qemu_test.sh index 3f5c934..0e7b83e 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 64 -display none & echo $! >pid) \ +(qemu-system-i386 -kernel test_kernel.bin -initrd ../../kernel/kernel.map -serial stdio -m 16 -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 a1f804d..c168e8c 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 64 -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 16 -display none & echo $! >pid & $0 watchdog) \ | tee >(grep -m 1 "TEST-" >result; kill -INT `cat pid`; kill -TERM `cat pid2`) \ |