summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-21 12:26:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-21 12:26:16 +0000
commite3bb5c4ba3470b0e5803434ab7506591c8bc6cf4 (patch)
tree7bb5b4ffb8c10c60b5ac678d3354b96c6f07492c
parentb6d3927e16357408720203a949cfa8741b9ebf6c (diff)
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
-rw-r--r--Makefile.in4
-rw-r--r--defs/gmake.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 5ac7d55..7da0ff9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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)
diff --git a/defs/gmake.mk b/defs/gmake.mk
index d961e27..5305790 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -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), \