diff options
Diffstat (limited to 'src/tests')
| -rwxr-xr-x | src/tests/ktests/run_qemu_test.sh | 2 | ||||
| -rw-r--r-- | src/tests/utests/fs2/test.c | 8 | ||||
| -rw-r--r-- | src/tests/utests/rules.make | 2 | ||||
| -rwxr-xr-x | src/tests/utests/run_qemu_test.sh | 2 | ||||
| -rw-r--r-- | src/tests/utests/subfs/test.c | 8 |
5 files changed, 13 insertions, 9 deletions
diff --git a/src/tests/ktests/run_qemu_test.sh b/src/tests/ktests/run_qemu_test.sh index e18a9d3..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 -serial stdio -m 16 -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/fs2/test.c b/src/tests/utests/fs2/test.c index f993c8e..7cc5fb6 100644 --- a/src/tests/utests/fs2/test.c +++ b/src/tests/utests/fs2/test.c @@ -14,10 +14,12 @@ int main(int argc, char **argv) { dirent_t x; size_t ent_no = 0; - ASSERT (readdir(f, ent_no++, &x)); + while (ent_no < 2) { + ASSERT (readdir(f, ent_no++, &x)); - ASSERT(!strcmp(x.name, "init.bin")); - ASSERT(x.st.type == FT_REGULAR); + ASSERT((!strcmp(x.name, "init.bin")) || (!strcmp(x.name, "kernel.map"))); + ASSERT(x.st.type == FT_REGULAR); + } ASSERT(!readdir(f, ent_no++, &x)); close(f); diff --git a/src/tests/utests/rules.make b/src/tests/utests/rules.make index 3e5fe1c..ec48e87 100644 --- a/src/tests/utests/rules.make +++ b/src/tests/utests/rules.make @@ -1,4 +1,4 @@ -LIB = ../../../lib/libkogata/libkogata.lib ../../../common/libc/libc.lib +LIB = ../../../lib/libkogata/libkogata.lib OBJ = test.o diff --git a/src/tests/utests/run_qemu_test.sh b/src/tests/utests/run_qemu_test.sh index 2de4bbb..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 -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 16 -display none & echo $! >pid & $0 watchdog) \ | tee >(grep -m 1 "TEST-" >result; kill -INT `cat pid`; kill -TERM `cat pid2`) \ diff --git a/src/tests/utests/subfs/test.c b/src/tests/utests/subfs/test.c index 2612939..5233ffe 100644 --- a/src/tests/utests/subfs/test.c +++ b/src/tests/utests/subfs/test.c @@ -16,10 +16,12 @@ int main(int argc, char **argv) { dirent_t x; size_t ent_no = 0; - ASSERT (readdir(f, ent_no++, &x)); + while (ent_no < 2) { + ASSERT (readdir(f, ent_no++, &x)); - ASSERT(!strcmp(x.name, "init.bin")); - ASSERT(x.st.type == FT_REGULAR); + ASSERT((!strcmp(x.name, "init.bin")) || (!strcmp(x.name, "kernel.map"))); + ASSERT(x.st.type == FT_REGULAR); + } ASSERT(!readdir(f, ent_no++, &x)); close(f); |