test: rename tenv-root -> sysroot

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

test/tenv/enter.sh

@@ -11,8 +11,8 @@ else
 fi
 
 TEST_DIR=$(dirname "$0")/..
-TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
-PID_FILE="$TENV_ROOT/running_test.pid"
+SYSROOT="${SYSROOT:-$(pwd)/${TEST_DIR}/sysroot}"
+PID_FILE="$SYSROOT/running_test.pid"
 
 if [ -f  "$PID_FILE" ] ; then
 	target=$(cat "$PID_FILE")
@@ -22,6 +22,7 @@ else
 	exit 1
 fi
 
-source "$TEST_DIR/test.env"
+# shellcheck disable=SC1091
+. "$TEST_DIR/test.env"
 
 "$(dirname "$0")"/exec.sh "$target" "$cmd" "$@"

test/tenv/exec.sh

@@ -32,7 +32,7 @@ target="$1"
 shift
 
 TEST_DIR=$(dirname "$0"../)
-TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
+SYSROOT="${SYSROOT:-$(pwd)/${TEST_DIR}/sysroot}"
 
 nsenter=$(command -v nsenter)
 chroot=$(command -v chroot)
@@ -54,4 +54,4 @@ export PATH
 	--net					\
 	--pid					\
 	-w -t "$target"				\
-	"$chroot" "$TENV_ROOT" "$@"
+	"$chroot" "$SYSROOT" "$@"

test/tenv/lib.sh

@@ -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")

test/tenv/root.mk

@@ -22,7 +22,7 @@
 
 srcdir         ?= ../
 SKEL           ?= $(srcdir)/skel
-DEST           ?= ../tenv-root
+DEST           ?= ../sysroot
 
 CACHE          ?= ~/.cache
 ARCH           ?= x86_64

test/tenv/start.sh

@@ -24,7 +24,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0"../)
-TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
+SYSROOT="${SYSROOT:-$(pwd)/${TEST_DIR}/sysroot}"
 
 unshare=$(command -v unshare)
 chroot=$(command -v chroot)
@@ -46,4 +46,4 @@ exec "$unshare"						\
      --mount						\
      --mount-proc					\
      --uts --ipc --net					\
-     "$chroot" "$TENV_ROOT" /sbin/chrootsetup.sh "$@"
+     "$chroot" "$SYSROOT" /sbin/chrootsetup.sh "$@"