test/: re-jigger the chroot tests to be fast on btrfs

1 files changed, 12 insertions, 10 deletions

diff --git a/test/libremakepkg-test.sh b/test/libremakepkg-test.sh
index e684f18..9f3bed3 100644
--- a/test/libremakepkg-test.sh
+++ b/test/libremakepkg-test.sh
@@ -4,6 +4,8 @@ describe libremakepkg
 
 . ./test-common.sh
 
+_setup_chrootdir
+
 before() {
 	_before libremakepkg
 
@@ -11,7 +13,7 @@ before() {
 
 	echo "BLACKLIST=https://repo.parabolagnulinux.org/docs/blacklist.txt" >"$XDG_CONFIG_HOME"/libretools/libretools.conf
 
-	echo "CHROOTDIR='$tmpdir/chrootdir'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
+	echo "CHROOTDIR='${chrootdir}'" > "$XDG_CONFIG_HOME"/libretools/chroot.conf
 	echo "CHROOT='default'" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
 	echo "CHROOTEXTRAPKG=()" >> "$XDG_CONFIG_HOME"/libretools/chroot.conf
 }
@@ -26,7 +28,7 @@ it_builds_a_trivial_package() {
 	cd "$tmpdir"
 
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
-	testsudo libremakepkg
+	testsudo libremakepkg -l "$roundup_test_name"
 
 	[[ -f $(echo libretools-hello-1.0-1-any.pkg.tar.?z) ]]
 }
@@ -50,13 +52,13 @@ it_cleans_the_chroot_before_building() {
 
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
 	cd "$tmpdir/1"
-	testsudo libremakepkg &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
+	testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
 	cd "$tmpdir/2"
-	testsudo libremakepkg &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
-	testsudo librechroot run libretools-testpkg1 'first time, pass'
+	testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
+	testsudo librechroot -l "$roundup_test_name" run libretools-testpkg1 'first time, pass'
 	cd "$tmpdir/3"
-	testsudo libremakepkg &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
-	! testsudo librechroot run libretools-testpkg1 'second time, fail'
+	testsudo libremakepkg -l "$roundup_test_name" &> "$tmpdir/out" || { r=$?; tail "$tmpdir/out"|cat -v; return $r; }
+	! testsudo librechroot -l "$roundup_test_name" run libretools-testpkg1 'second time, fail'
 }
 
 it_handles_PKGDEST_not_existing() {
@@ -65,14 +67,14 @@ it_handles_PKGDEST_not_existing() {
 	cd "$tmpdir"
 
 	libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty
-	testsudo env PKGDEST="$tmpdir/dest/pkgdest" libremakepkg
+	testsudo env PKGDEST="$tmpdir/dest/pkgdest" libremakepkg -l "$roundup_test_name"
 
 	[[ -f $(echo dest/pkgdest/libretools-hello-1.0-1-any.pkg.tar.?z) ]]
 }
 
 it_displays_help_as_normal_user() {
 	rm -rf "$XDG_CONFIG_HOME"
-	LC_ALL=C libremakepkg -h >$tmpdir/stdout 2>$tmpdir/stderr
+	LC_ALL=C libremakepkg -l "$roundup_test_name" -h >$tmpdir/stdout 2>$tmpdir/stderr
 
 	[[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]]
 	empty $tmpdir/stderr
@@ -83,7 +85,7 @@ it_otherwise_fails_as_normal_user() {
 	cp libremakepkg.d/PKGBUILD-hello "$tmpdir/PKGBUILD"
 	cd "$tmpdir"
 
-	libremakepkg >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
+	libremakepkg -l "$roundup_test_name" >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
 	empty $tmpdir/stdout