summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in18
-rw-r--r--common.mk15
-rw-r--r--win32/Makefile.sub7
3 files changed, 26 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in
index 8953f6910e3..0c142192045 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -474,21 +474,11 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
-test-bundled-gems-precheck: $(arch)-fake.rb programs
-
-test-bundled-gems-fetch: $(PREP)
- $(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
-
-yes-test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
- $(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
- --install-dir .bundle --conservative 'minitest:~> 5' 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
-
-test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
-yes-test-bundled-gems: yes-test-bundled-gems-prepare
- for gem in minitest test-unit xmlrpc net-telnet did_you_mean power_assert rake; do \
+test-bundled-gems-run:
+ $(Q) set -e; while read gem _; do \
+ echo testing $$gem gem && \
$(XRUBY) -C $(srcdir)/gems/src/$$gem -Ilib ../../../.bundle/bin/rake; \
- done
-no-test-bundled-gems:
+ done < $(srcdir)/gems/bundled_gems
update-src::
@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
diff --git a/common.mk b/common.mk
index 691f39ee491..3dd2a431e9c 100644
--- a/common.mk
+++ b/common.mk
@@ -1157,6 +1157,21 @@ update-bundled_gems: PHONY
"$(srcdir)/gems/bundled_gems" | \
"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
+test-bundled-gems-precheck: $(arch)-fake.rb programs
+
+test-bundled-gems-fetch: $(PREP)
+ $(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems
+
+test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
+ $(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
+ --install-dir .bundle --conservative 'minitest:~> 5' 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
+
+PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
+test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems
+yes-test-bundled-gems: test-bundled-gems-run
+no-test-bundled-gems:
+test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
+
test-bundler-precheck: $(arch)-fake.rb programs
yes-test-bundler-prepare: test-bundler-precheck
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ed53cd9e952..24b59fbdd65 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1097,6 +1097,13 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
-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% \
+ )
+
$(ruby_pc): $(RBCONFIG)
@$(BOOTSTRAPRUBY) $(srcdir)/tool/expand-config.rb \
-output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \