yugui	2008-10-27 15:34:23 +0900 (Mon, 27 Oct 2008)

  New Revision: 19962

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19962

  Log:
    * test/minitest/test_mini_test.rb: fixed that r19958 made
      test-all fail when the ruby was built at $(srcdir).

  Modified files:
    trunk/ChangeLog
    trunk/test/minitest/test_mini_test.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19961)
+++ ChangeLog	(revision 19962)
@@ -1,3 +1,8 @@
+Mon Oct 27 15:32:08 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* 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@y...>
 
 	* test/ruby/envutil.rb: reverted the changeset 19948 because it
Index: test/minitest/test_mini_test.rb
===================================================================
--- test/minitest/test_mini_test.rb	(revision 19961)
+++ test/minitest/test_mini_test.rb	(revision 19962)
@@ -28,8 +28,10 @@
     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'",

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/