test: Add sane default for TESTENV_ROOT; enable easier independent test runs

Signed-off-by: Jacques de Laval <jacques@de-laval.se>
This commit is contained in:
Jacques de Laval committed 2021-02-25 17:38:56 +01:00
1 parent 48b732e53d
commit ea4fe2045d
8 files changed
+17 -14

No files matched your search

+7 -4
View File
@@ -90,16 +90,19 @@ teardown() {
wait
if [ -d "$TESTS_ROOT/var/lock" ]; then
if [ -d "$TESTENV_ROOT/var/lock" ]; then
chmod +r test-root/var/lock
fi
rm -f "$TESTS_ROOT"/running_test.pid
rm -f "$TESTENV_ROOT"/running_test.pid
}
trap teardown EXIT
TESTENV_ROOT="${TESTENV_ROOT:-$(pwd)/${TEST_DIR}/test-root}"
export TESTENV_ROOT
# shellcheck source=/dev/null
. "$TESTS_ROOT/../test.env"
. "$TESTENV_ROOT/../test.env"
TEST_NAME="$(dirname "$0")"
TEST_NAME=${TEST_NAME#*/}
@@ -114,7 +117,7 @@ fi
# shellcheck disable=2086
"$TEST_DIR/testenv_start.sh" finit ${FINIT_ARGS:-} &
finit_ppid=$!
echo "$finit_ppid" > "$TESTS_ROOT"/running_test.pid
echo "$finit_ppid" > "$TESTENV_ROOT"/running_test.pid
>&2 echo "Hint: Execute 'test/testenv_enter.sh' to enter the test namespace"
>&2 echo "finit conf '$FINIT_CONF'"