mirror of
https://github.com/troglobit/finit.git
synced 2026-10-31 13:00:32 +00:00
test: rename tenv-root -> sysroot
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
82c6e4680f
commit
8b9258aa73
12 files changed
+29
-28
No files matched your search
+6
-6
@@ -235,7 +235,7 @@ teardown()
|
||||
wait
|
||||
|
||||
say "Final cleanup ..."
|
||||
rm -f "$TENV_ROOT"/running_test.pid
|
||||
rm -f "$SYSROOT"/running_test.pid
|
||||
|
||||
|
||||
say "EXIT: $test_status"
|
||||
@@ -244,11 +244,11 @@ teardown()
|
||||
|
||||
trap teardown EXIT
|
||||
|
||||
TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
|
||||
export TENV_ROOT
|
||||
SYSROOT="${SYSROOT:-$(pwd)/${TEST_DIR}/sysroot}"
|
||||
export SYSROOT
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
. "$TENV_ROOT/../test.env"
|
||||
. "$SYSROOT/../test.env"
|
||||
|
||||
# Setup test environment
|
||||
if [ -n "${DEBUG:-}" ]; then
|
||||
@@ -265,9 +265,9 @@ fi
|
||||
# shellcheck disable=2086
|
||||
"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} &
|
||||
finit_ppid=$!
|
||||
echo "$finit_ppid" > "$TENV_ROOT"/running_test.pid
|
||||
echo "$finit_ppid" > "$SYSROOT"/running_test.pid
|
||||
|
||||
#>&2 echo "Hint: Execute 'TENV_ROOT=$TENV_ROOT $TEST_DIR/tenv/enter.sh' to enter the test namespace"
|
||||
#>&2 echo "Hint: Execute 'SYSROOT=$SYSROOT $TEST_DIR/tenv/enter.sh' to enter the test namespace"
|
||||
log "$color_reset" 'Setup of test environment done, waiting for Finit ...' ''
|
||||
|
||||
finit_pid=$(retry "pgrep -P $finit_ppid")
|
||||
|
||||
Reference in new issue
Block a user