From ce34147cf4de2212b77d11d83a8e4cbd9df52683 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 20 Jul 2009 02:13:00 +0000
Subject: * configure.in, Makefile.in (TEST_RUNNABLE): tests are not   runnable
 if cross-compiling.

* common.mk (btest*, test*): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  7 +++++++
 Makefile.in  |  1 +
 common.mk    | 20 +++++++++++++++-----
 configure.in |  3 +++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34240178db..bc2d0cb4dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 20 11:12:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in, Makefile.in (TEST_RUNNABLE): tests are no
+	  runnable if cross-compiling.
+
+	* common.mk (btest*, test*): ditto.
+
 Mon Jul 20 10:55:18 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in
diff --git a/Makefile.in b/Makefile.in
index 9da6eb80d0..e096f7e5db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,7 @@ AUTOCONF = autoconf
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
+TEST_RUNNABLE = @TEST_RUNNABLE@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
diff --git a/common.mk b/common.mk
index e4fbfe01f1..458810d747 100644
--- a/common.mk
+++ b/common.mk
@@ -389,21 +389,31 @@ clean-enc distclean-enc realclean-enc:
 
 check: test test-all
 
-btest: miniruby$(EXEEXT) PHONY
+btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
+no-btest: PHONY
+yes-btest: PHONY
 	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
 
-btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
+no-btest-ruby: PHONY
+yes-btest-ruby: PHONY
 	@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
 
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
+no-test-sample: PHONY
+yes-test-sample: PHONY
 	@$(RUNRUBY) $(srcdir)/tool/rubytest.rb
 
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
+no-test-knownbug: PHONY
+yes-test-knownbug: PHONY
 	$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
 
 test: test-sample btest-ruby test-knownbug
 
-test-all:
+test-all: $(TEST_RUNNABLE)-test-all
+no-test-all: PHONY
+yes-test-all: PHONY
 	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
 
 extconf: $(PREP)
diff --git a/configure.in b/configure.in
index 8779e983a1..a2a7c594eb 100644
--- a/configure.in
+++ b/configure.in
@@ -1910,12 +1910,15 @@ if test x"$cross_compiling" = xyes; then
   test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
   PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  TEST_RUNNABLE=no
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
   MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
   PREP='miniruby$(EXEEXT)'
   RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
+  TEST_RUNNABLE=yes
 fi
+AC_SUBST(TEST_RUNNABLE)
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
-- 
cgit v1.2.3