runtests: Add extended list of unit tests

1 files changed, 38 insertions, 9 deletions

diff --git a/runtests b/runtests
index 19b4989..00de59f 100755
--- a/runtests
+++ b/runtests
@@ -38,7 +38,8 @@ ${WORKDIR}/.COMMIT.mk: ${WORKDIR}/systemd.git
 
 check: ${WORKDIR}/build-232/pkgdest
 check: ${WORKDIR}/build-$(COMMIT)/pkgdest
-check: ${WORKDIR}/build-$(COMMIT)/integration-tests.log
+check: ${WORKDIR}/build-$(COMMIT)/sd-tests-integration.log
+check: ${WORKDIR}/build-$(COMMIT)/sd-tests-unit.log
 .PHONY: check
 
 # osi-mk base images ###########################################################
@@ -136,12 +137,24 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 
 # tests ########################################################################
 
-%/integration-tests.raw: %/build.raw %/build.log
+%/sd-tests.raw: %/build.raw %/build.log
 	rm -f -- '$@' '$@.tmp'
 	./osi-mk \
 		--edit='$(filter %.raw,$^)' \
-		--size=10G \
 		--package=base-devel \
+		'$@.tmp'
+	./osi-shell '$@.tmp' <<-'EOF'
+		bsdtar xfO /home/testuser/packages/srcpkgdest/systemd-*.src.tar.gz systemd/.SRCINFO |
+		    sed -nE -e 's/^\s+(|make|check)depends(|_\S*) = //p' -e '/^\s*pkgname/q' |
+		    xargs pacman -S --needed --noconfirm --
+		EOF
+	mv -T -- '$@.tmp' '$@'
+
+%/sd-tests-integration.raw: %/sd-tests.raw
+	rm -f -- '$@' '$@.tmp'
+	./osi-mk \
+		--edit='$(filter %.raw,$^)' \
+		--size=10G \
 		--package=qemu \
 		--package=net-tools \
 		--package=dhclient \
@@ -150,13 +163,8 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 		--package=busybox \
 		--package=plymouth \
 		'$@.tmp'
-	./osi-shell '$@.tmp' <<-'EOF'
-		bsdtar xfO /home/testuser/packages/srcpkgdest/systemd-*.src.tar.gz systemd/.SRCINFO |
-		    sed -nE -e 's/^\s+(|make|check)depends(|_\S*) = //p' -e '/^\s*pkgname/q' |
-		    xargs pacman -S --needed --noconfirm --
-		EOF
 	mv -T -- '$@.tmp' '$@'
-%/integration-tests.log: %/integration-tests.raw
+%/sd-tests-integration.log: %/sd-tests-integration.raw
 	./osi-shell -- '$<' -m 1024 <<-'EOF' |& tee '$@.tmp'
 		set -e
 		mkdir -p /build
@@ -170,3 +178,24 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 		EOF
 	mv -T -- '$@.tmp' '$@'
 	touch -- '$@'
+
+%/sd-tests-unit.raw: %/sd-tests.raw
+	rm -f -- '$@' '$@.tmp'
+	./osi-mk \
+		--edit='$(filter %.raw,$^)' \
+		--size=5G \
+		'$@.tmp'
+	mv -T -- '$@.tmp' '$@'
+%/sd-tests-unit.log: %/sd-tests-unit.raw
+	./osi-shell '$<' <<-'EOF' |& tee '$@.tmp'
+		set -e
+		mkdir -p /build
+		mount --bind /var/lib/archbuild/default/testuser/build /build
+		su testuser
+		set -e
+		cd /build/systemd/src/build
+		meson configure -Dtests=unsafe -Dslow-tests=true
+		ninja test
+		EOF
+	mv -T -- '$@.tmp' '$@'
+	touch -- '$@'