From 46af6fd7ae034d7d324d5221801073370339871e Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Dec 2008 01:59:11 +0000
Subject: merges r20664 from trunk into ruby_1_9_1. * common.mk (run, runruby,
 parse, gdb, gdb-ruby): you can also run   other scripts than
 $(srcdir)/test.rb.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 common.mk | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e2f9a91b..a8e837984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 12 19:24:47 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* common.mk (run, runruby, parse, gdb, gdb-ruby): you can also run
+	  other scripts than $(srcdir)/test.rb.
+
 Fri Dec 12 19:13:43 2008  TAKAO Kouji  <kouji@takao7.net>
 
 	* ext/readline/readline.c (readline_readline): changed the message
diff --git a/common.mk b/common.mk
index 78a9e00bc..a4c2bf1eb 100644
--- a/common.mk
+++ b/common.mk
@@ -114,6 +114,8 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
 TESTSDIR      = $(srcdir)/test
 TESTWORKDIR   = testwork
 
+TESTRUN_SCRIPT = $(srcdir)/test.rb
+
 BOOTSTRAPRUBY = $(BASERUBY)
 
 COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb
@@ -683,13 +685,13 @@ $(srcdir)/ext/ripper/ripper.c:
 ##
 
 run: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(srcdir)/test.rb $(RUNOPT)
+	$(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
 
 runruby: $(PROGRAM) PHONY
-	$(RUNRUBY) $(srcdir)/test.rb
+	$(RUNRUBY) $(TESTRUN_SCRIPT)
 
 parse: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb
+	$(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
 
 COMPARE_RUBY = $(BASERUBY)
 ITEM = 
@@ -720,10 +722,10 @@ run.gdb:
 	echo run                              >> run.gdb
 
 gdb: miniruby$(EXEEXT) run.gdb PHONY
-	gdb -x run.gdb --quiet --args $(MINIRUBY) $(srcdir)/test.rb
+	gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
 
 gdb-ruby: $(PROGRAM) run.gdb PHONY
-	gdb -x run.gdb --quiet --args $(PROGRAM) $(srcdir)/test.rb
+	gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
 
 dist:
 	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
-- 
cgit