ruby-changes:47864
From: nobu <ko1@a...>
Date: Thu, 21 Sep 2017 21:26:22 +0900 (JST)
Subject: [ruby-changes:47864] nobu:r59985 (trunk): gmake.mk: order test-bundler
nobu 2017-09-21 21:26:16 +0900 (Thu, 21 Sep 2017) New Revision: 59985 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59985 Log: gmake.mk: order test-bundler * defs/gmake.mk (ORDERED_TEST_TARGETS): order test-bundler too to get rid of mixing outputs. Modified files: trunk/Makefile.in trunk/defs/gmake.mk Index: defs/gmake.mk =================================================================== --- defs/gmake.mk (revision 59984) +++ defs/gmake.mk (revision 59985) @@ -61,7 +61,7 @@ endif https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L61 ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \ btest-ruby test-knownbug test-basic \ test-testframework test-ruby test-almost test-all \ - test-spec \ + test-spec test-bundler-prepare test-bundler \ ) prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck) $(foreach test,$(ORDERED_TEST_TARGETS), \ Index: Makefile.in =================================================================== --- Makefile.in (revision 59984) +++ Makefile.in (revision 59985) @@ -473,14 +473,14 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(S https://github.com/ruby/ruby/blob/trunk/Makefile.in#L473 test-bundler-precheck: $(arch)-fake.rb programs -test-bundler-prepare: test-bundler-precheck +yes-test-bundler-prepare: test-bundler-precheck $(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \ --install-dir spec/rspec --conservative 'rspec:~> 3.5' RSPECOPTS = --format progress BUNDLER_SPECS = test-bundler: $(TEST_RUNNABLE)-test-bundler -yes-test-bundler: test-bundler-prepare +yes-test-bundler: yes-test-bundler-prepare $(gnumake_recursive)$(Q) \ $(XRUBY) -C $(srcdir) -Ispec/bundler spec/rspec/bin/rspec \ $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/