summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-24 06:52:59 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-24 06:52:59 +0000
commit3aa45744ab0d100934dcefcc90fdf157f259c7f4 (patch)
tree38b1bbb4de8059c81e0dcfb441be44cfe07243ef /common.mk
parent1fb587ddec95d23675a2ff919d5f4f11339ae247 (diff)
* bootstraptest/runner.rb: set default directory to
'/tmp/bootstraptest.tmpwd' and add --dir option. fix to output driver and target information. * common.mk: fix to run btest on BASERUBY and add OPTS to pass option ("make btest OPTS=..."). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 133d0c0611..1ad8999874 100644
--- a/common.mk
+++ b/common.mk
@@ -92,7 +92,7 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
TESTSDIR = $(srcdir)/test
TESTWORKDIR = testwork
-BOOTSTRAPRUBY = $(MINIRUBY)
+BOOTSTRAPRUBY = $(BASERUBY)
all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
@@ -315,7 +315,7 @@ realclean-ext::
check: test test-all
btest: $(MINIRUBY) PHONY
- @$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)"
+ $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
@$(MINIRUBY) $(srcdir)/rubytest.rb