diff options
| -rw-r--r-- | ci/_test-git-branch.sh | 4 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libktest.sh | 2 | ||||
| -rw-r--r-- | lib/supervisor.c (renamed from lib/qemu-wrapper.c) | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/ci/_test-git-branch.sh b/ci/_test-git-branch.sh index de43b4f..1c09b73 100644 --- a/ci/_test-git-branch.sh +++ b/ci/_test-git-branch.sh @@ -67,7 +67,7 @@ for t in ${SUBTESTS[@]}; do echo "========= NOT STARTED" > ktest-out/out/$TEST_NAME.$t/status done -make -C "$KTEST_DIR/lib" qemu-wrapper +make -C "$KTEST_DIR/lib" supervisor while (( ${#SUBTESTS[@]} )); do FULL_LOG=$TEST_NAME.$(hostname).$(date -Iseconds).log @@ -78,7 +78,7 @@ while (( ${#SUBTESTS[@]} )); do "ktest-out/out/$TEST_NAME.$FNAME/full_log.br" done - $KTEST_DIR/lib/qemu-wrapper -T 1200 -f "$FULL_LOG" -S -F \ + $KTEST_DIR/lib/supervisor -T 1200 -f "$FULL_LOG" -S -F \ -b $TEST_NAME -o ktest-out/out \ build-test-kernel run $TEST_PATH ${SUBTESTS[@]} || true diff --git a/lib/Makefile b/lib/Makefile index b9c5a4b..62b5682 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,5 +1,5 @@ CFLAGS=-Wall -g -O2 -qemu-wrapper: +supervisor: get-test-job: lwip-connect: LDLIBS=-llwipv6 diff --git a/lib/libktest.sh b/lib/libktest.sh index 301b2dd..ecdbd22 100644 --- a/lib/libktest.sh +++ b/lib/libktest.sh @@ -260,8 +260,6 @@ start_vm() log_verbose "ktest_arch=$ktest_arch" - make -C "$ktest_dir/lib" qemu-wrapper - if [[ -z $ktest_kernel_binary ]]; then echo "Required parameter -k missing: kernel" exit 1 diff --git a/lib/qemu-wrapper.c b/lib/supervisor.c index 219b2a2..94f3ed3 100644 --- a/lib/qemu-wrapper.c +++ b/lib/supervisor.c @@ -223,8 +223,8 @@ static void test_end(struct timespec now) static void usage(void) { - puts("qemu-wrapper - wrapper for qemu to catch test success/failure\n" - "Usage: qemu-wrapper [OPTIONS] -- <qemu-command>\n" + puts("supervisor - test supervisor" + "Usage: supervisor [OPTIONS] -- <test-command>\n" "\n" "Options\n" " -S Exit on success\n" |