diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-08-23 12:47:16 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-08-23 13:40:32 -0400 |
| commit | f68c80c058020dec0ea6c9393bbcab5d83f4d5fd (patch) | |
| tree | 9f8c216e050c9c772620a04b2fa174f663767a4e | |
| parent | ed8cf8e27cb8b8abd9577dc7f721d1e269a2d435 (diff) | |
Fix checking for qemu binary
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | lib/libktest.sh | 6 | ||||
| -rw-r--r-- | lib/util.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libktest.sh b/lib/libktest.sh index 86073e0..282870c 100644 --- a/lib/libktest.sh +++ b/lib/libktest.sh @@ -28,7 +28,6 @@ ktest_dio=off ktest_nice=0 checkdep socat -checkdep qemu-system-x86_64 qemu-system-x86 checkdep brotli # config files: @@ -259,10 +258,11 @@ get_unused_port() start_vm() { - checkdep_arch - log_verbose "ktest_arch=$ktest_arch" + checkdep $QEMU_BIN $QEMU_PACKAGE + check_root_image_exists + if [[ -z $ktest_kernel_binary ]]; then echo "Required parameter -k missing: kernel" exit 1 diff --git a/lib/util.sh b/lib/util.sh index 115bbd6..42d21dd 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -1,7 +1,7 @@ . "$ktest_dir/lib/common.sh" -checkdep_arch() +check_root_image_exists() { if [[ -z $ktest_root_image ]]; then if [[ -f $HOME/.ktest/root.$DEBIAN_ARCH ]]; then |