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

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

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"