diff --git a/test/test-functions b/test/test-functions index 837082890a0..f6a824ae693 100644 --- a/test/test-functions +++ b/test/test-functions @@ -50,6 +50,11 @@ PATH_TO_INIT=$ROOTLIBDIR/systemd [ "$SYSTEMD_NSPAWN" ] || SYSTEMD_NSPAWN=$(which -a $BUILD_DIR/systemd-nspawn systemd-nspawn 2>/dev/null | grep '^/' -m1) [ "$JOURNALCTL" ] || JOURNALCTL=$(which -a $BUILD_DIR/journalctl journalctl 2>/dev/null | grep '^/' -m1) +STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))" +STATEFILE="$STATEDIR/.testdir" +IMAGESTATEDIR="$STATEDIR/.." +TESTLOG="$STATEDIR/test.log" + BASICTOOLS=( awk basename @@ -148,11 +153,6 @@ DEBUGTOOLS=( vi ) -STATEDIR="${BUILD_DIR:-.}/test/$(basename $(dirname $(realpath $0)))" -STATEFILE="$STATEDIR/.testdir" -IMAGESTATEDIR="$STATEDIR/.." -TESTLOG="$STATEDIR/test.log" - is_built_with_asan() { if ! type -P objdump >/dev/null; then ddebug "Failed to find objdump. Assuming systemd hasn't been built with ASAN."