diff options
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | template/Makefile.in | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
3 files changed, 5 insertions, 13 deletions
@@ -1290,7 +1290,12 @@ 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: + +# 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 f7210bc2ab..ed9e8b686e 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -532,12 +532,6 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP) 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 d600783912..a2521d4ed5 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1220,13 +1220,6 @@ $(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% \ - ) - 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 |