https://git.ruby-lang.org/ruby.git/commit/?id=4e8336bae8

From 4e8336bae853e712eb884b87560621c2da4c4743 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 4 Nov 2019 23:58:36 +0900
Subject: Share test-bundled-gems-run in common.mk


diff --git a/common.mk b/common.mk
index 3f7b8ac..4b3a2f9 100644
--- a/common.mk
+++ b/common.mk
@@ -1290,7 +1290,12 @@ PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare https://github.com/ruby/ruby/blob/trunk/common.mk#L1290
 test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
 yes-test-bundled-gems: test-bundled-gems-run
 no-test-bundled-gems:
+
+# Override this to allow failure of specific gems on CI
+# TEST_BUNDLED_GEMS_ALLOW_FAILURES =
+
 test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
+	$(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb $(XRUBY)
 
 test-bundler-precheck: $(arch)-fake.rb programs
 
diff --git a/template/Makefile.in b/template/Makefile.in
index f7210bc..ed9e8b6 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -532,12 +532,6 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP) https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L532
 
 cont.$(OBJEXT): $(COROUTINE_H)
 
-# Override this to allow failure of specific gems on CI
-TEST_BUNDLED_GEMS_ALLOW_FAILURES =
-
-test-bundled-gems-run:
-	$(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb $(XRUBY)
-
 update-src::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index d600783..a2521d4 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1220,13 +1220,6 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1220
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(win_srcdir)
 
-test-bundled-gems-run:
-	$(Q) for /f %G in ($(srcdir)/gems/bundled_gems) do @( \
-	  echo testing %G gem & \
-	  $(XRUBY) -C $(srcdir)/gems/src/%G -Ilib ../../../.bundle/bin/rake || \
-	  exit /b %STATUS% \
-	)
-
 update-benchmark-driver:
 	$(GIT) clone https://github.com/benchmark-driver/benchmark-driver $(srcdir)/benchmark/benchmark-driver || \
 	  $(GIT) -C $(srcdir)/benchmark/benchmark-driver pull origin master
-- 
cgit v0.10.2


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