* test/minitest/test_mini_test.rb: fixed that r19958 made

test-all fail when the ruby was built at $(srcdir). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
funny-falcon · Oct 27, 2008 · a1cef99 · a1cef99
1 parent 0a88cb5
commit a1cef99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 15:32:08 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* test/minitest/test_mini_test.rb: fixed that r19958 made
+	  test-all fail when the ruby was built at $(srcdir).
+
 Mon Oct 27 12:04:58 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* test/ruby/envutil.rb: reverted the changeset 19948 because it

diff --git a/test/minitest/test_mini_test.rb b/test/minitest/test_mini_test.rb
@@ -28,8 +28,10 @@ def teardown
     Object.send :remove_const, :ATestCase if defined? ATestCase
   end
 
-  pwd = Pathname.new(Dir.pwd)
-  MINITEST_BASE_DIR = Pathname.new(File.expand_path(MiniTest::MINI_DIR)).relative_path_from(pwd)
+  pwd = Pathname.new(File.expand_path Dir.pwd)
+  basedir = Pathname.new(File.expand_path(MiniTest::MINI_DIR)) + 'mini'
+  basedir = basedir.relative_path_from(pwd).to_s
+  MINITEST_BASE_DIR = basedir[/\A\./] ? basedir : "./#{basedir}"
   BT_MIDDLE = ["#{MINITEST_BASE_DIR}/test.rb:165:in `run_test_suites'",
                "#{MINITEST_BASE_DIR}/test.rb:161:in `each'",
                "#{MINITEST_BASE_DIR}/test.rb:161:in `run_test_suites'",