summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--bootstraptest/runner.rb3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bef3d45..516d79b 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 b5237c2..07d6efc 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")