diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 20 | ||||
| -rw-r--r-- | configure.in | 3 |
4 files changed, 26 insertions, 5 deletions
@@ -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 9da6eb80d..e096f7e5d 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@ @@ -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 8779e983a..a2a7c594e 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) |