diff --git a/test/Makefile b/test/Makefile index 351b37b..044d1b7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -18,9 +18,7 @@ other: .FORCE zdtm: .FORCE $(MAKE) zdtm_ns - for t in $(shell echo "$(TST)" | tr ' ' '\n' | grep -Pv $(EXP)); do \ - $(MAKE) $$t || break; \ - done + $(MAKE) zdtm_nons .PHONY: zdtm fault-injection: .FORCE @@ -28,7 +26,9 @@ fault-injection: .FORCE .PHONY: fault-injection zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | grep -P $(EXP)) +zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | grep -vP $(EXP)) + $(TST): - ./zdtm.sh ${ZDTM_ARGS} $(@) &> $(subst /,_,$@).log || \ + unshare -impn -- bash -c "( ip link set up dev lo && mount --make-rprivate / && umount -l /proc && mount -t proc proc /proc/ && bash ./zdtm.sh ${ZDTM_ARGS} $(@) )" &> $(subst /,_,$@).log || \ { flock Makefile cat $(subst /,_,$@).log; exit 1; } .PHONY: zdtm_ns