From 4096e4b08c46dddb8edc9dabf70e737946ac6df8 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sun, 29 Sep 2019 12:16:10 +0200 Subject: Move the logic to test bundled gems to Ruby code * Writing shell scripts in a Makefile is very error-prone. * TEST_BUNDLED_GEMS_ALLOW_FAILURES seemed to not work before. --- template/Makefile.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'template') diff --git a/template/Makefile.in b/template/Makefile.in index d7e139c6d4..117c1cd5c4 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -536,15 +536,7 @@ cont.$(OBJEXT): $(COROUTINE_H) TEST_BUNDLED_GEMS_ALLOW_FAILURES = test-bundled-gems-run: - $(Q) fail=0 keep=; case "$(MFLAGS)" in *k*) keep=1;; esac; \ - while read gem _; do \ - echo testing $$gem gem; \ - [ $$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; \ - exit $$fail + $(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb update-src:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) -- cgit v1.2.3