test: refactor test framework to use a rootfs skeleton

Instead of having to create files, and copying them in place for each
test, we move all static test files to a skeleton rootfs.  This makes
it a lot easier to get an overview of how things and how they work.

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

test/tenv/busybox-x86_64.md5

@@ -1 +0,0 @@
-ea7e2353af0067a926d3e021e504290e  busybox-x86_64

test/tenv/chrootsetup.sh

@@ -1,50 +0,0 @@
-#!/bin/sh
-# Setup the things (mount /proc, /tmp, etc.) that needs to be set up from
-# within the namespace/chroot and then start PID 1.
-#
-# Copyright (c) 2021  Jacques de Laval <jacques@de-laval.se>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-#     all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-set -eu
-export PATH=$PATH:/usr/bin:/usr/sbin
-
-# It would have been nice to mount /dev as devtmpfs, but unfortunately
-# that's not possible if you're not privileged. For now tmpfs will
-# have to do.
-mount -n -t tmpfs none /dev
-
-mount -t proc none /proc
-mount -t sysfs none /sys
-
-if [ "$(ls -A /tmp)" ]; then
-	mkdir -p /tmp.shadow
-	mount --bind /tmp /tmp.shadow
-	mount -t tmpfs none /tmp
-	cp -a /tmp.shadow/* /tmp/
-else
-	mount -t tmpfs none /tmp
-fi
-
-mkdir -p "$FINIT_RCSD"
-
-tty=/dev/$(cat /sys/class/tty/console/active)
-mkfifo "$tty"
-
-exec "$@"

test/tenv/root.mk

@@ -20,8 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-DEST           ?= ../tenv-root
 srcdir         ?= ../
+SKEL           ?= $(srcdir)/skel
+DEST           ?= ../tenv-root
 
 CACHE          ?= ~/.cache
 ARCH           ?= x86_64
@@ -33,34 +34,19 @@ BBBIN           = busybox-$(ARCH)
 BBHOME         ?= https://www.busybox.net/downloads/binaries
 BBURL          ?= $(BBHOME)/$(BBVER)-defconfig-multiarch-musl/$(BBBIN)
 
-dirs            = $(DEST)/bin			\
-		$(DEST)/dev			\
-		$(DEST)/etc			\
-		$(DEST)/proc			\
-		$(DEST)/sbin			\
-		$(DEST)/usr/bin			\
-		$(DEST)/usr/sbin		\
-		$(DEST)/var			\
-		$(DEST)/run			\
-		$(DEST)/sys			\
-		$(DEST)/test_assets		\
-		$(DEST)/tmp
-
 _libs_src       = $(shell ldd $(FINITBIN) | grep -Eo '/[^ ]+')
 libs            = $(foreach path,$(_libs_src),$(abspath $(DEST))$(path))
 
-all: $(dirs) $(libs) $(DEST)/bin/chrootsetup.sh $(DEST)/bin/$(BBBIN)
-	touch $(DEST)/etc/fstab
+all: $(libs) $(DEST)/bin/$(BBBIN)
 	@(cd $(DEST);					\
 	for prg in `./bin/$(BBBIN) --list-full`; do 	\
 		ln -sf /bin/$(BBBIN) $$prg;		\
 	done)
 
-$(dirs):
-	mkdir -p $@
-
 $(DEST)/bin/$(BBBIN).md5:
-	cp $(srcdir)/tenv/$(notdir $@) $@
+	@mkdir -p $(DEST)
+	@cp -a $(SKEL)/* $(DEST)/
+	@find $(DEST) -name .empty -delete
 
 $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
 	@(cd $(dir $@);								\
@@ -85,9 +71,6 @@ $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
 	fi)
 	@chmod +x $@
 
-$(DEST)/bin/chrootsetup.sh:
-	cp $(srcdir)/tenv/$(notdir $@) $@
-
 $(libs):
 	mkdir -p $(dir $@)
 	cp $(patsubst $(abspath $(DEST))%,%,$@) $@

test/tenv/start.sh

@@ -46,4 +46,4 @@ exec "$unshare"						\
      --mount						\
      --mount-proc					\
      --uts --ipc --net					\
-     "$chroot" "$TENV_ROOT" /bin/chrootsetup.sh "$@"
+     "$chroot" "$TENV_ROOT" /sbin/chrootsetup.sh "$@"