mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
gmake.mk: order test-bundler
* 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:
parent
b6d3927e16
commit
e3bb5c4ba3
2 changed files with 3 additions and 3 deletions
|
@ -473,14 +473,14 @@ enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
|
|||
|
||||
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)
|
||||
|
|
|
@ -61,7 +61,7 @@ endif
|
|||
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), \
|
||||
|
|
Loading…
Reference in a new issue