test: namespace cleanup, common -> src, tenv -> lib, etc.

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

TODO.org

@@ -1,6 +1 @@
-* 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 sysroot
-* TODO rename test/lib.sh to start.sh or sth
 

configure.ac

@@ -15,7 +15,7 @@ AC_CONFIG_FILES([Makefile
 	plugins/Makefile
 	src/Makefile
 	test/test.env test/Makefile
-	test/tenv/Makefile test/common/Makefile])
+	test/lib/Makefile test/src/Makefile])
 
 # Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR()
 #m4_include([m4/plugin.m4])

test/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS                  = common tenv
+SUBDIRS                  = lib src
 
 EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env  \
 			   skel/bin/pre.sh skel/bin/post.sh skel/bin/ready.sh skel/bin/slay  \
@@ -17,7 +17,7 @@ EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env
 			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		     \
 			   skel/usr/local/etc/.empty skel/var/.empty
 
-EXTRA_DIST		+= setup-root.sh
+EXTRA_DIST		+= setup-sysroot.sh
 EXTRA_DIST		+= add-remove-dynamic-service.sh
 EXTRA_DIST		+= add-remove-dynamic-service-sub-config.sh
 EXTRA_DIST		+= cond-start-task.sh
@@ -85,7 +85,7 @@ check-recursive: setup-chroot
 
 .PHONY: setup-chroot
 setup-chroot:
-	@SYSROOT='$(abs_builddir)/sysroot/' srcdir=$(srcdir) top_builddir=$(top_builddir) $(srcdir)/setup-root.sh
+	@SYSROOT='$(abs_builddir)/sysroot/' srcdir=$(srcdir) top_builddir=$(top_builddir) $(srcdir)/setup-sysroot.sh
 
 clean-local:
 	-rm -rf $(builddir)/sysroot/

test/add-remove-dynamic-service-sub-config.sh

@@ -4,9 +4,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -15,6 +12,9 @@ test_teardown()
 	run "rm -f $FINIT_RCSD/service.conf"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say "Add a dynamic service in $FINIT_RCSD/service.conf"

test/add-remove-dynamic-service.sh

@@ -4,9 +4,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -15,6 +12,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say "Add a dynamic service in $FINIT_CONF"

test/cond-start-task.sh

@@ -7,12 +7,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
-TEST_CONF=$FINIT_RCSD/cond.conf
-
-
 test_setup()
 {
 	say "Test start $(date)"
@@ -88,4 +82,10 @@ test_one()
 	run "initctl reload"
 }
 
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
+TEST_CONF=$FINIT_RCSD/cond.conf
+
 test_one "hello" "task <usr/hello> task.sh -- Hello task"

test/crashing.sh

@@ -61,7 +61,7 @@ test_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 

test/depserv.sh

@@ -28,7 +28,7 @@ test_teardown()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 #run "ls -l /run/finit/cond/pid/ /lib/finit/plugins/"

test/devmon.sh

@@ -7,9 +7,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_setup()
 {
 	say "Test start $(date)"
@@ -60,6 +57,9 @@ test_one()
 	run "initctl reload"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 sep
 test_one "dev/fbsplash"
 sep

test/failing-sysv.sh

@@ -21,7 +21,7 @@ test_teardown()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 # This instructs serv to check the environment, and exit
 # if it cannot find "xyzzy", thus triggering a premature

test/global-envs.sh

@@ -17,7 +17,7 @@ test_teardown()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 say "Add custom envs to $FINIT_CONF ..."

test/initctl-status-subset.sh

@@ -34,7 +34,7 @@ test_add_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 test_init
 

test/lib/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST	 = exec.sh setup.sh start.sh sysroot.mk

test/lib/setup.sh

@@ -100,7 +100,7 @@ assert_has_pidfile()
 # shellcheck disable=SC2154
 texec()
 {
-	"$TEST_DIR/tenv/exec.sh" "$finit_pid" "$@"
+	"$TEST_DIR/lib/exec.sh" "$finit_pid" "$@"
 }
 
 run()
@@ -263,11 +263,11 @@ else
 fi
 
 # shellcheck disable=2086
-"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} &
+"$TEST_DIR/lib/start.sh" finit ${FINIT_ARGS:-} &
 finit_ppid=$!
 echo "$finit_ppid" > "$SYSROOT"/running_test.pid
 
-#>&2 echo "Hint: Execute 'SYSROOT=$SYSROOT $TEST_DIR/tenv/enter.sh' to enter the test namespace"
+#>&2 echo "Hint: Execute 'SYSROOT=$SYSROOT $TEST_DIR/lib/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/notify.sh

@@ -99,7 +99,7 @@ test_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 

test/pidfile.sh

@@ -18,12 +18,6 @@ test_teardown()
 	run "rm -f $FINIT_CONF" "/tmp/post"
 }
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
-#run "initctl debug"
-#run "ls -l /run/finit/cond/pid/ /lib/finit/plugins/"
-
 test_one()
 {
 	pidfn=$1
@@ -41,6 +35,12 @@ test_one()
 	run "initctl reload"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
+#run "initctl debug"
+#run "ls -l /run/finit/cond/pid/ /lib/finit/plugins/"
+
 test_one "/run/serv.pid" "service serv -np"
 test_one "/run/serv.pid" "service pid:!/run/serv.pid serv"
 test_one "/run/serv.pid" "service type:forking serv"

test/pre-post-serv.sh

@@ -51,7 +51,7 @@ test_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 

test/ready-serv.sh

@@ -42,7 +42,7 @@ test_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 #run "initctl debug"
 

test/restart-self.sh

@@ -25,7 +25,7 @@ check_restarts()
 
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 say "Add stanza to $FINIT_CONF"
 run "echo 'service serv -np -r serv -- Restart self' > $FINIT_CONF"

test/runlevel.sh

@@ -18,7 +18,7 @@ test_teardown()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 say 'Check runlevel'
 lvl=$(run "initctl runlevel | awk '{print \$2;}'")

test/setup-sysroot.sh

@@ -6,10 +6,10 @@ set -eu
 make -C "$top_builddir" DESTDIR="$SYSROOT" install
 
 mkdir -p "$SYSROOT/sbin/"
-cp "$top_builddir/test/common/serv" "$SYSROOT/sbin/"
+cp "$top_builddir/test/src/serv" "$SYSROOT/sbin/"
 
 # shellcheck disable=SC2154
-FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$SYSROOT" make -f "$srcdir/tenv/root.mk"
+FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$SYSROOT" make -f "$srcdir/lib/sysroot.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

test/signal-service.sh

@@ -5,9 +5,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -16,6 +13,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say 'Ensure file system is cleared'

test/start-kill-service.sh

@@ -6,9 +6,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -17,6 +14,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 rm -f "$SYSROOT"/oldpid
 

test/start-kill-stop.sh

@@ -9,9 +9,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 #	run "initctl status -j serv"
@@ -21,6 +18,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Check deps ..."
 check_dep jq
 

test/start-stop-serv.sh

@@ -53,7 +53,7 @@ test_one()
 }
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 test_one "/run/serv.pid"  "service pid:!/run/serv.pid serv -- Forking service, type 1"
 test_one "/run/serv.pid"  "service type:forking       serv -- Forking service, type 2"

test/start-stop-service-sub-config.sh

@@ -4,9 +4,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -15,6 +12,9 @@ test_teardown()
 	run "rm -f $FINIT_RCSD/service.conf"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say "Add service stanza in $FINIT_RCSD/service.conf"

test/start-stop-service.sh

@@ -4,9 +4,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -15,6 +12,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say "Add service stanza in $FINIT_CONF"

test/start-stop-sysv.sh

@@ -4,9 +4,6 @@ set -eu
 
 TEST_DIR=$(dirname "$0")
 
-# shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
-
 test_teardown()
 {
 	say "Test done $(date)"
@@ -15,6 +12,9 @@ test_teardown()
 	run "rm -f $FINIT_CONF"
 }
 
+# shellcheck source=/dev/null
+. "$TEST_DIR/lib/setup.sh"
+
 say "Test start $(date)"
 
 say "Add sysv stanza in $FINIT_CONF"

test/tenv/Makefile.am

@@ -1 +0,0 @@
-EXTRA_DIST	 = lib.sh exec.sh start.sh root.mk

test/testserv.sh

@@ -10,7 +10,7 @@ FINIT_ARGS="finit.cond=testserv"
 TEST_DIR=$(dirname "$0")
 
 # shellcheck source=/dev/null
-. "$TEST_DIR/tenv/lib.sh"
+. "$TEST_DIR/lib/setup.sh"
 
 run "initctl"
 run "initctl status testserv"