kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in, Makefile.in (TEST_RUNNABLE): tests are not

Browse source 
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
This commit is contained in:
nobu 2009-07-20 02:13:00 +00:00
parent 1a36dbe3ba
commit ce34147cf4
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Mon Jul 20 10:55:18 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in * ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in

1
Makefile.in
View file

@ -17,6 +17,7 @@ AUTOCONF = autoconf
@SET_MAKE@ @SET_MAKE@
MKFILES = @MAKEFILES@ MKFILES = @MAKEFILES@
BASERUBY = @BASERUBY@ BASERUBY = @BASERUBY@
TEST_RUNNABLE = @TEST_RUNNABLE@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@

20
common.mk
View file

@ -389,21 +389,31 @@ clean-enc distclean-enc realclean-enc:
check: test test-all 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) $(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) @$(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 @$(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 $(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
test: test-sample btest-ruby test-knownbug 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) $(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
extconf: $(PREP) extconf: $(PREP)

3
configure.in
View file

@ -1910,12 +1910,15 @@ if test x"$cross_compiling" = xyes; then
test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake' test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
PREP='$(arch)-fake.rb' PREP='$(arch)-fake.rb'
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
TEST_RUNNABLE=no
else else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
PREP='miniruby$(EXEEXT)' PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)'
TEST_RUNNABLE=yes
fi fi
AC_SUBST(TEST_RUNNABLE)
AC_SUBST(MINIRUBY) AC_SUBST(MINIRUBY)
AC_SUBST(PREP) AC_SUBST(PREP)
AC_SUBST(RUNRUBY) AC_SUBST(RUNRUBY)