dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27013 from fbuihuu/test-fixlets

Browse Source 
Test fixlets
This commit is contained in:
Yu Watanabe
2023-03-28 13:45:24 +09:00
committed by GitHub
parent 30dbadf65e 04ef5d1bd7
commit 19279652c0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/test-functions
View File

@@ -107,10 +107,10 @@ fi
TEST_BASE_DIR=${TEST_BASE_DIR:-$(realpath "$(dirname "${BASH_SOURCE[0]}")")}
TEST_UNITS_DIR="$(realpath "$TEST_BASE_DIR/units")"
SOURCE_DIR=$(realpath "$TEST_BASE_DIR/..")
TOOLS_DIR="$SOURCE_DIR/tools"
# These variables are used by test scripts
export TEST_BASE_DIR TEST_UNITS_DIR SOURCE_DIR TOOLS_DIR
export TEST_BASE_DIR TEST_UNITS_DIR SOURCE_DIR
TOOLS_DIR="$SOURCE_DIR/tools"
# note that find-build-dir.sh will return $BUILD_DIR if provided, else it will try to find it
if get_bool "${NO_BUILD:=}"; then
BUILD_DIR="$SOURCE_DIR"
@@ -133,7 +133,14 @@ if [ -z "$TESTFILE" ]; then
exit 1
fi
TESTNAME="$(basename "$(dirname "$(realpath "$TESTFILE")")")"
STATEDIR="$BUILD_DIR/test/$TESTNAME"
WORKDIR="/var/tmp/systemd-tests"
if get_bool "${NO_BUILD:=}"; then
STATEDIR="$WORKDIR/$TESTNAME"
else
STATEDIR="$BUILD_DIR/test/$TESTNAME"
fi
STATEFILE="$STATEDIR/.testdir"
IMAGESTATEDIR="$STATEDIR/.."
TESTLOG="$STATEDIR/test.log"
@@ -2228,7 +2235,7 @@ import_testdir() {
LOOPDEV="$_LOOPDEV"
if [[ ! -d "$TESTDIR" ]]; then
if [[ -z "$TESTDIR" ]]; then
TESTDIR="$(mktemp --tmpdir=/var/tmp -d -t systemd-test.XXXXXX)"
TESTDIR="$(mktemp --tmpdir=$WORKDIR -d -t systemd-test.XXXXXX)"
else
mkdir -p "$TESTDIR"
fi
@@ -3029,6 +3036,7 @@ _test_cleanup() {
fi
[[ -n "$TESTDIR" ]] && rm -vfr "$TESTDIR"
[[ -n "$STATEFILE" ]] && rm -vf "$STATEFILE"
[[ -n "$STATEDIR" ]] && rm -vfr "$STATEDIR"
) || :
}
@@ -3190,6 +3198,7 @@ do_test() {
[[ -d $usrlibdir ]] && libdirs+=" $usrlibdir" && break
done
mkdir -p "$WORKDIR"
mkdir -p "$STATEDIR"
import_testdir