runtests: Fixup quoting

Only in the integration-tests.log does it make a difference, though.

1 files changed, 5 insertions, 4 deletions

diff --git a/runtests b/runtests
index b144848..7f97183 100755
--- a/runtests
+++ b/runtests
@@ -91,7 +91,7 @@ ${WORKDIR}/build-232/build.raw:
 		'$@.tmp'
 	mv -T -- '$@.tmp' '$@'
 ${WORKDIR}/build-232/build.log: %/build.log: %/build.raw
-	./osi-shell '$<' <<-EOF |& tee '$@.tmp'
+	./osi-shell '$<' <<-'EOF' |& tee '$@.tmp'
 		su testuser || exit
 		set -e
 		cd ~/packages/abs/systemd
@@ -118,7 +118,7 @@ ${WORKDIR}/build-$(COMMIT)/build.raw: | ${WORKDIR}/.COMMIT.mk
 		'$@.tmp'
 	mv -T -- '$@.tmp' '$@'
 ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
-	./osi-shell '$<' <<-EOF |& tee '$@.tmp'
+	./osi-shell '$<' <<-'EOF' |& tee '$@.tmp'
 		su testuser || exit
 		set -e
 		cd ~/packages/abs/systemd
@@ -147,7 +147,7 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 		'$@.tmp'
 	mv -T -- '$@.tmp' '$@'
 %/integration-tests.log: %/integration-tests.raw
-	./osi-shell '$<' <<-EOF |& tee '$@.tmp'
+	./osi-shell '$<' <<-'EOF' |& tee '$@.tmp'
 		set -e
 		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' |
@@ -157,9 +157,10 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
 		su testuser
 		set -e
 		cd /build/systemd/src/systemd
-		export BUILD_DIR=$PWD/build
+		export BUILD_DIR=$$PWD/build
 		export KERNEL_BIN=/boot/vmlinuz-linux-libre
 		export INITRD=/boot/initramfs-linux-libre.img
 		./test/run-integration-tests.sh
+		EOF
 	mv -T -- '$@.tmp' '$@'
 	touch -- '$@'