From 01cd10bb2defcbf8f6dddb9e1aa2205cb257480a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 May 2008 13:39:35 +0000
Subject: * bootstraptest/runner.rb (main): handle relative path -r options.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 4 ++++
 bootstraptest/runner.rb | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bef3d4549..516d79bba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 11 22:39:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/runner.rb (main): handle relative path -r options.
+
 Sun May 11 19:04:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/ruby/test_thread.rb: kill and join temporal threads that are
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index b5237c21f..07d6efcb6 100644
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -52,7 +52,8 @@ def main
     when /\A--ruby=(.*)/
       @ruby = $1
       @ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
-      @ruby.gsub!(/-I([^ ]*)/){"-I"+File.expand_path($1)}
+      @ruby.gsub!(/(\s+-I\s*)(\S+)/){$1+File.expand_path($2)}
+      @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
       true
     when /\A--sets=(.*)/
       tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
-- 
cgit