1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for cross-compiling

Browse Source 
* common.mk (test-rubyspec): add dependency for cross-compiling.

* defs/gmake.mk: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-03-02 04:54:18 +00:00
parent 745f4dd5b8
commit 6e0967ec6d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.mk
View File

@ -706,8 +706,10 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
test-rubyspec-precheck: $(arch)-fake.rb test-rubyspec-precheck: $(arch)-fake.rb
test-rubyspec: test-rubyspec-precheck test-rubyspec: $(TEST_RUNNABLE)-test-rubyspec
yes-test-rubyspec: test-rubyspec-precheck
$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
no-test-rubyspec: test-rubyspec-precheck
RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@ -1223,7 +1225,7 @@ exam: check test-rubyspec
love: sudo-precheck up all test install check love: sudo-precheck up all test install check
@echo love is all you need @echo love is all you need
yes-test-all: sudo-precheck yes-test-all no-test-all: sudo-precheck
sudo-precheck: PHONY sudo-precheck: PHONY
@$(SUDO) echo > $(NULL) @$(SUDO) echo > $(NULL)

13
defs/gmake.mk
View File

@ -3,9 +3,9 @@ gnumake = yes
override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+)
override mflags := $(filter-out -j%,$(MFLAGS)) override mflags := $(filter-out -j%,$(MFLAGS))
CHECK_TARGETS := exam love check% CHECK_TARGETS := exam love check test check% test% btest%
# expand test targets, and those dependents # expand test targets, and those dependents
TEST_TARGETS := $(filter exam check test check% test% btest%,$(MAKECMDGOALS)) TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS)) TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS))
TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS))
TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS))
@ -60,8 +60,8 @@ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
test-rubyspec \ test-rubyspec \
) )
prev_test := $(if $(filter test-rubyspec,$(ORDERED_TEST_TARGETS)),test-rubyspec-precheck) prev_test := $(if $(filter test-rubyspec,$(ORDERED_TEST_TARGETS)),test-rubyspec-precheck)
$(foreach test,$(addprefix yes-,$(ORDERED_TEST_TARGETS)), \ $(foreach test,$(ORDERED_TEST_TARGETS), \
$(eval $(value test): $(value prev_test)); \ $(eval yes-$(value test) no-$(value test): $(value prev_test)); \
$(eval prev_test := $(value test))) $(eval prev_test := $(value test)))
ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),) ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
@ -74,11 +74,6 @@ install-prereq: uninstall
uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs) uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
endif endif
ifneq ($(filter exam,$(MAKECMDGOALS)),)
test-rubyspec: check
yes-test-all no-test-all: test
endif
ifneq ($(filter love,$(MAKECMDGOALS)),) ifneq ($(filter love,$(MAKECMDGOALS)),)
showflags: up showflags: up
sudo-precheck: test yes-test-testframework no-test-testframework sudo-precheck: test yes-test-testframework no-test-testframework