summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-16 14:40:23 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-16 14:40:23 -0400
commit1bb26b9161077fbe6344729db8498f64e1b676d2 (patch)
tree86be767f04c814144ce53c097fc5b0475ac9379e
parent8d864769fe04047490ca92ff9a7e33827fde7a75 (diff)
runtests: Install packages as part of integration-tests.raw, not .log
-rwxr-xr-xruntests10
1 files changed, 6 insertions, 4 deletions
diff --git a/runtests b/runtests
index 7f97183..2210750 100755
--- a/runtests
+++ b/runtests
@@ -145,14 +145,16 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw
--package=qemu \
--package=dhclient \
'$@.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
./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' |
- xargs pacman -S --needed --
- mkdir /build
+ mkdir -p /build
mount --bind /var/lib/archbuild/default/testuser/build /build
su testuser
set -e