summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-07-24 12:13:07 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-07-24 12:13:07 +0900
commit5108a5dd7f8d29043354f7ad923f3d670a01d0a5 (patch)
treeb674fc4487f0bb5ee5e27ef57632e82f8895196e
parenta39f218f22e8ec205291022f9b748d51daa8df3b (diff)
test-bundled-gems-run: Respect -k option
-rw-r--r--template/Makefile.in9
1 files changed, 6 insertions, 3 deletions
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)