test: make the install dracut the default to run tests

After the --local flag is removed, using the local copy of dracut.sh
for running tests is no longer possible, so change the default.

diff --git a/test/test-functions b/test/test-functions
index cc8ad17f213b5953935f106c78965a7205f1c14e..f331275268977fb896ad94dca1ab9c3566df1dc8 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -26,7 +26,7 @@ export TESTDIR
 
 if [[ -z $basedir ]]; then basedir="$(realpath ../..)"; fi
 
-DRACUT=${DRACUT-${basedir}/dracut.sh}
+DRACUT=${DRACUT-dracut}
 PKGLIBDIR=${PKGLIBDIR-$basedir}
 
 TEST_KERNEL_CMDLINE+=" rd.retry=10 rd.timeout=30 rd.info rd.shell=0 panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot console=ttyS0,115200n81 $DEBUGFAIL "

diff --git a/test/test-github.sh b/test/test-github.sh
index 23a31cdea73a6c712341a06cad115c190a6648f3..337ed92ca75dff9fda5aae7a490a6a7e59cc3022 100755 (executable)
--- a/test/test-github.sh
+++ b/test/test-github.sh
@@ -7,8 +7,6 @@
 set -e
 if [ "$V" = "2" ]; then set -x; fi
 
-export DRACUT=dracut
-
 [[ -d ${0%/*} ]] && cd "${0%/*}"/../
 
 # disable building documentation by default

diff --git a/test/test.sh b/test/test.sh
index 7cff08ef4c6347a9ad67815739077776797b61a9..3ae3ffc190e65fe6f25b61fc403c49bae39b620c 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -19,7 +19,7 @@ fi
 # clear previous test run
 TARGETS='clean all install check' "$PODMAN" run --rm -it \
     --device=/dev/kvm \
-    -e V -e TESTS -e TEST_RUN_ID -e TARGETS -e DRACUT \
+    -e V -e TESTS -e TEST_RUN_ID -e TARGETS \
     -v "$PWD"/:/z \
     "ghcr.io/dracut-ng/$CONTAINER" \
     /z/test/test-github.sh