nobu	2017-03-02 13:54:18 +0900 (Thu, 02 Mar 2017)

  New Revision: 57756

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57756

  Log:
    fix for cross-compiling
    
    * common.mk (test-rubyspec): add dependency for cross-compiling.
    
    * defs/gmake.mk: ditto.

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 57755)
+++ defs/gmake.mk	(revision 57756)
@@ -3,9 +3,9 @@ gnumake = yes https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L3
 override gnumake_recursive := $(if $(findstring n,$(firstword $(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
-TEST_TARGETS := $(filter exam check test check% test% btest%,$(MAKECMDGOALS))
+TEST_TARGETS := $(filter $(CHECK_TARGETS),$(MAKECMDGOALS))
 TEST_DEPENDS := $(filter-out $(TEST_TARGETS),$(MAKECMDGOALS))
 TEST_TARGETS := $(patsubst exam,check test-rubyspec,$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out exam $(TEST_TARGETS),$(TEST_DEPENDS))
@@ -60,8 +60,8 @@ ORDERED_TEST_TARGETS := $(filter $(TEST_ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L60
 	test-rubyspec \
 	)
 prev_test := $(if $(filter test-rubyspec,$(ORDERED_TEST_TARGETS)),test-rubyspec-precheck)
-$(foreach test,$(addprefix yes-,$(ORDERED_TEST_TARGETS)), \
-	$(eval $(value test): $(value prev_test)); \
+$(foreach test,$(ORDERED_TEST_TARGETS), \
+	$(eval yes-$(value test) no-$(value test): $(value prev_test)); \
 	$(eval prev_test := $(value test)))
 
 ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
@@ -74,11 +74,6 @@ install-prereq: uninstall https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L74
 uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
 endif
 
-ifneq ($(filter exam,$(MAKECMDGOALS)),)
-test-rubyspec: check
-yes-test-all no-test-all: test
-endif
-
 ifneq ($(filter love,$(MAKECMDGOALS)),)
 showflags: up
 sudo-precheck: test yes-test-testframework no-test-testframework
Index: common.mk
===================================================================
--- common.mk	(revision 57755)
+++ common.mk	(revision 57756)
@@ -706,8 +706,10 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L706
 
 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)
+no-test-rubyspec: test-rubyspec-precheck
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@@ -1223,7 +1225,7 @@ exam: check test-rubyspec https://github.com/ruby/ruby/blob/trunk/common.mk#L1225
 love: sudo-precheck up all test install check
 	@echo love is all you need
 
-yes-test-all: sudo-precheck
+yes-test-all no-test-all: sudo-precheck
 
 sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/