kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

gmake.mk: order test-bundler

Browse source 
* defs/gmake.mk (ORDERED_TEST_TARGETS): order test-bundler too to
  get rid of mixing outputs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-21 12:26:16 +00:00
parent b6d3927e16
commit e3bb5c4ba3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -473,14 +473,14 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
test-bundler-precheck: $(arch)-fake.rb programs 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 \ $(XRUBY) -C "$(srcdir)" bin/gem install --no-ri --no-rdoc \
--install-dir spec/rspec --conservative 'rspec:~> 3.5' --install-dir spec/rspec --conservative 'rspec:~> 3.5'
RSPECOPTS = --format progress RSPECOPTS = --format progress
BUNDLER_SPECS = BUNDLER_SPECS =
test-bundler: $(TEST_RUNNABLE)-test-bundler test-bundler: $(TEST_RUNNABLE)-test-bundler
yes-test-bundler: test-bundler-prepare yes-test-bundler: yes-test-bundler-prepare
$(gnumake_recursive)$(Q) \ $(gnumake_recursive)$(Q) \
$(XRUBY) -C $(srcdir) -Ispec/bundler spec/rspec/bin/rspec \ $(XRUBY) -C $(srcdir) -Ispec/bundler spec/rspec/bin/rspec \
$(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)

2
defs/gmake.mk
View file

@ -61,7 +61,7 @@ endif
ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
btest-ruby test-knownbug test-basic \ btest-ruby test-knownbug test-basic \
test-testframework test-ruby test-almost test-all \ 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) prev_test := $(if $(filter test-spec,$(ORDERED_TEST_TARGETS)),test-spec-precheck)
$(foreach test,$(ORDERED_TEST_TARGETS), \ $(foreach test,$(ORDERED_TEST_TARGETS), \