aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-20 00:48:24 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-20 00:48:24 +0000
commitd4e0abcec9aae83243c93efb5bcc6ec760151745 (patch)
treeb0e0cef590d141713472602042253acb6e82c34b
parent27fdb77821957b5a304b1730ce9f95c899a3b5be (diff)
downloadruby-d4e0abcec9aae83243c93efb5bcc6ec760151745.tar.gz
* test/runner.rb: search srcdir/test/arg at first to find test/ruby
directory when "ruby" is specified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/runner.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d46f08395d..e07dbeab05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 20 09:47:13 2008 Tanaka Akira <akr@fsij.org>
+
+ * test/runner.rb: search srcdir/test/arg at first to find test/ruby
+ directory when "ruby" is specified.
+
Mon Oct 20 08:20:01 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: support Encoding.default_internal.
diff --git a/test/runner.rb b/test/runner.rb
index aa7a5f8ba3..3f1c8abc19 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -11,12 +11,12 @@ Test::Unit.setup_argv {|files|
[src_testdir]
else
files.map {|f|
- if File.exist? f
- f
- elsif File.exist? "#{src_testdir}/#{f}"
+ if File.exist? "#{src_testdir}/#{f}"
"#{src_testdir}/#{f}"
elsif File.exist? "#{srcdir}/#{f}"
"#{srcdir}/#{f}"
+ elsif File.exist? f
+ f
else
raise ArgumentError, "not found: #{f}"
end