diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-16 14:40:23 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-16 14:40:23 -0400 |
commit | 1bb26b9161077fbe6344729db8498f64e1b676d2 (patch) | |
tree | 86be767f04c814144ce53c097fc5b0475ac9379e | |
parent | 8d864769fe04047490ca92ff9a7e33827fde7a75 (diff) |
runtests: Install packages as part of integration-tests.raw, not .log
-rwxr-xr-x | runtests | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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 |