diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-17 17:23:27 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-17 17:52:18 -0400 |
| commit | 37af28b465702feec359c1cd9094b5a195748228 (patch) | |
| tree | 6983d52ff8bbbbdb77de6b57e742c7c5edce05a8 /runtests | |
| parent | bdf396f8b8bf58f5bca8677b54e7c9d25a7e6b80 (diff) | |
runtests: merge the unit logs back together
Diffstat (limited to 'runtests')
| -rwxr-xr-x | runtests | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -39,7 +39,7 @@ ${WORKDIR}/.COMMIT.mk: ${WORKDIR}/systemd.git check: ${WORKDIR}/build-232/pkgdest check: ${WORKDIR}/build-$(COMMIT)/pkgdest check: ${WORKDIR}/build-$(COMMIT)/sd-tests-integration.log -check: ${WORKDIR}/build-$(COMMIT)/sd-tests-unit.test.log +check: ${WORKDIR}/build-$(COMMIT)/sd-tests-unit.log .PHONY: check # osi-mk base images ########################################################### @@ -187,24 +187,19 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw --package=python-pyparsing \ '$@.tmp' mv -T -- '$@.tmp' '$@' -%/sd-tests-unit.build.log: %/sd-tests-unit.raw +%/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 - EOF - mv -T -- '$@.tmp' '$@' - touch -- '$@' -%/sd-tests-unit.test.log: %/sd-tests-unit.raw %/sd-tests-unit.build.log - ./osi-shell '$<' <<-'EOF' |& tee '$@.tmp' - set -e - mkdir -p /build - mount --bind /var/lib/archbuild/default/testuser/build /build + exit + ninja -C /build/systemd/src/build test EOF mv -T -- '$@.tmp' '$@' |