From 5108a5dd7f8d29043354f7ad923f3d670a01d0a5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 24 Jul 2019 12:13:07 +0900 Subject: test-bundled-gems-run: Respect -k option --- template/Makefile.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'template/Makefile.in') diff --git a/template/Makefile.in b/template/Makefile.in index df424997f4..718f3804d3 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -536,12 +536,15 @@ cont.$(OBJEXT): $(COROUTINE_H) TEST_BUNDLED_GEMS_ALLOW_FAILURES = test-bundled-gems-run: - $(Q) while read gem _; do \ + $(Q) fail=0 keep=; case "$(MFLAGS)" in *k*) keep=1;; esac; \ + while read gem _; do \ echo testing $$gem gem; \ - echo $(TEST_BUNDLED_GEMS_ALLOW_FAILURES) | grep -q $$gem || set -e; \ + [ $$keep ] || echo $(TEST_BUNDLED_GEMS_ALLOW_FAILURES) | grep -q $$gem || set -e; \ $(XRUBY) -C $(srcdir)/gems/src/$$gem -Ilib ../../../.bundle/bin/rake; \ + [ $$? = 0 ] || fail=1; \ set +e; \ - done < $(srcdir)/gems/bundled_gems + done < $(srcdir)/gems/bundled_gems; \ + exit $$fail update-src:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) -- cgit v1.2.3