aboutsummaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2016-07-30 23:39:14 +0200
committerAlex Auvolat <alex@adnab.me>2016-07-30 23:39:14 +0200
commit2f34f0694f953fd00d2885b86634bbd618852fed (patch)
tree2eabba74b136043596e0bc6e5148184a4e7da87b /src/tests
parentf58f65c30de315d4419f69a92a708cbed797ff37 (diff)
downloadkogata-2f34f0694f953fd00d2885b86634bbd618852fed.tar.gz
kogata-2f34f0694f953fd00d2885b86634bbd618852fed.zip
Fix stuff
Diffstat (limited to 'src/tests')
-rwxr-xr-xsrc/tests/ktests/run_qemu_test.sh2
-rwxr-xr-xsrc/tests/utests/run_qemu_test.sh2
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 bc86f12..d27fa97 100755
--- a/src/tests/ktests/run_qemu_test.sh
+++ b/src/tests/ktests/run_qemu_test.sh
@@ -6,7 +6,7 @@ LOGFILE=$2
RESULTFILE=`mktemp`
PIDFILE=`mktemp`
-(timeout 3s qemu-system-i386 -kernel $BINFILE -serial stdio -m 16 -display none 2>/dev/null \
+(timeout 5s qemu-system-i386 -kernel $BINFILE -serial stdio -m 16 -display none 2>/dev/null \
& echo $! >$PIDFILE) \
| tee >(grep -m 1 "TEST-" >$RESULTFILE; kill -INT `cat $PIDFILE`) > $LOGFILE
diff --git a/src/tests/utests/run_qemu_test.sh b/src/tests/utests/run_qemu_test.sh
index b9f3c36..c66f2e1 100755
--- a/src/tests/utests/run_qemu_test.sh
+++ b/src/tests/utests/run_qemu_test.sh
@@ -7,7 +7,7 @@ KERNEL=$3
RESULTFILE=`mktemp`
PIDFILE=`mktemp`
-(timeout 3s qemu-system-i386 -kernel $KERNEL -append "init=io:/mod/`basename $BINFILE`" \
+(timeout 5s qemu-system-i386 -kernel $KERNEL -append "init=io:/mod/`basename $BINFILE`" \
-initrd "$BINFILE" -serial stdio -m 16 -display none 2>/dev/null \
& echo $! >$PIDFILE) \
| tee >(grep -m 1 "TEST-" >$RESULTFILE; kill -INT `cat $PIDFILE`) >$LOGFILE