test: rename tenv-root -> sysroot

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

.globalrc

@@ -4,4 +4,4 @@ default:\
 	:tc=common:
 
 common:\
-	:skip=tags,TAGS,ID,y.tab.c,y.tab.h,gtags.files,cscope.files,cscope.out,cscope.po.out,cscope.in.out,,{arch}/,autom4te.cache/,*.orig,*.rej,*.bak,*~,#*#,*.swp,*.tmp,*_flymake.*,*_flymake,*.o,*.a,*.so,*.lo,*.zip,*.gz,*.bz2,*.xz,*.lzh,*.Z,*.tgz,*.min.js,*min.css,tenv-root/:
+	:skip=tags,TAGS,ID,y.tab.c,y.tab.h,gtags.files,cscope.files,cscope.out,cscope.po.out,cscope.in.out,,{arch}/,autom4te.cache/,*.orig,*.rej,*.bak,*~,#*#,*.swp,*.tmp,*_flymake.*,*_flymake,*.o,*.a,*.so,*.lo,*.zip,*.gz,*.bz2,*.xz,*.lzh,*.Z,*.tgz,*.min.js,*min.css,sysroot/:

TODO.org

@@ -1,6 +1,6 @@
 * DONE fix pid parser, //run/foo.pid -> /var/run///run/foo.pid
 ** DONE test framework refactor 'texec sh -c ...' -> 'run ...'
 * TODO Clean up tests a bit
-* TODO Drop tenv or common and rename tenv-root
+* TODO Drop tenv or common and rename sysroot
 * TODO rename test/lib.sh to start.sh or sth
 

test/.gitignore

@@ -6,4 +6,4 @@
 
 /test.env
 /checkself.sh
-/tenv-root
+/sysroot

test/Makefile.am

@@ -42,8 +42,8 @@ EXTRA_DIST		+= start-stop-serv.sh
 EXTRA_DIST		+= signal-service.sh
 EXTRA_DIST		+= testserv.sh
 
-AM_TESTS_ENVIRONMENT	 = TENV_ROOT='$(abs_builddir)/tenv-root/';
-AM_TESTS_ENVIRONMENT	+= export TENV_ROOT;
+AM_TESTS_ENVIRONMENT	 = SYSROOT='$(abs_builddir)/sysroot/';
+AM_TESTS_ENVIRONMENT	+= export SYSROOT;
 AM_TESTS_ENVIRONMENT	+= export LD_LIBRARY_PATH;
 AM_TESTS_ENVIRONMENT	+= top_builddir=$(top_builddir);
 AM_TESTS_ENVIRONMENT	+= export top_builddir;
@@ -85,8 +85,8 @@ check-recursive: setup-chroot
 
 .PHONY: setup-chroot
 setup-chroot:
-	@TENV_ROOT='$(abs_builddir)/tenv-root/' srcdir=$(srcdir) top_builddir=$(top_builddir) $(srcdir)/setup-root.sh
+	@SYSROOT='$(abs_builddir)/sysroot/' srcdir=$(srcdir) top_builddir=$(top_builddir) $(srcdir)/setup-root.sh
 
 clean-local:
-	-rm -rf $(builddir)/tenv-root/
+	-rm -rf $(builddir)/sysroot/
 	-rm -f checkself.sh

test/setup-root.sh

@@ -3,15 +3,15 @@
 set -eu
 
 # shellcheck disable=SC2154
-make -C "$top_builddir" DESTDIR="$TENV_ROOT" install
+make -C "$top_builddir" DESTDIR="$SYSROOT" install
 
-mkdir -p "$TENV_ROOT/sbin/"
-cp "$top_builddir/test/common/serv" "$TENV_ROOT/sbin/"
+mkdir -p "$SYSROOT/sbin/"
+cp "$top_builddir/test/common/serv" "$SYSROOT/sbin/"
 
 # shellcheck disable=SC2154
-FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$TENV_ROOT" make -f "$srcdir/tenv/root.mk"
+FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$SYSROOT" make -f "$srcdir/tenv/root.mk"
 
 # Drop plugins we don't need in test, only causes confusing FAIL in logs.
 for plugin in tty.so urandom.so rtc.so modprobe.so hotplug.so; do
-	find "$TENV_ROOT" -name $plugin -delete
+	find "$SYSROOT" -name $plugin -delete
 done

test/start-kill-service.sh

@@ -18,7 +18,7 @@ test_teardown()
 }
 
 say "Test start $(date)"
-rm -f "$TENV_ROOT"/oldpid
+rm -f "$SYSROOT"/oldpid
 
 say "Add service stanza in $FINIT_CONF"
 run "echo 'service [2345] respawn log:stderr service.sh -- Test service' > $FINIT_CONF"

test/start-kill-stop.sh

@@ -25,7 +25,7 @@ say "Check deps ..."
 check_dep jq
 
 say "Test start $(date)"
-rm -f "$TENV_ROOT"/oldpid
+rm -f "$SYSROOT"/oldpid
 
 say "Add service stanza in $FINIT_CONF"
 run "echo 'service [2345] log:stderr serv -np -- Test service' > $FINIT_CONF"

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