[前][次][番号順一覧][スレッド一覧]

ruby-changes:56636

From: Nobuyoshi <ko1@a...>
Date: Wed, 24 Jul 2019 12:13:32 +0900 (JST)
Subject: [ruby-changes:56636] Nobuyoshi Nakada: 5108a5dd7f (master): test-bundled-gems-run: Respect -k option

https://git.ruby-lang.org/ruby.git/commit/?id=5108a5dd7f

From 5108a5dd7f8d29043354f7ad923f3d670a01d0a5 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 24 Jul 2019 12:13:07 +0900
Subject: test-bundled-gems-run: Respect -k option


diff --git a/template/Makefile.in b/template/Makefile.in
index df42499..718f380 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -536,12 +536,15 @@ cont.$(OBJEXT): $(COROUTINE_H) https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L536
 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 v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]