diff options
| -rwxr-xr-x | runtests | 15 |
1 files changed, 12 insertions, 3 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.log +check: ${WORKDIR}/build-$(COMMIT)/sd-tests-unit.test.log .PHONY: check # osi-mk base images ########################################################### @@ -186,7 +186,7 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw --size=5G \ '$@.tmp' mv -T -- '$@.tmp' '$@' -%/sd-tests-unit.log: %/sd-tests-unit.raw +%/sd-tests-unit.build.log: %/sd-tests-unit.raw ./osi-shell '$<' <<-'EOF' |& tee '$@.tmp' set -e mkdir -p /build @@ -195,7 +195,16 @@ ${WORKDIR}/build-$(COMMIT)/build.log: %/build.log: %/build.raw set -e cd /build/systemd/src/build meson configure -Dtests=unsafe -Dslow-tests=true - ninja test + 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 + ninja -C /build/systemd/src/build test EOF mv -T -- '$@.tmp' '$@' touch -- '$@' |