diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-27 06:34:23 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-27 06:34:23 +0000 |
| commit | 39fdca626dae71c15ed573bc8cb9e71b8d766549 (patch) | |
| tree | c6e76e1b5beea25afb79807d1e285dd9991c5780 | |
| parent | e0b3d5c763a98c49485630b69b3e73b342b5f1d0 (diff) | |
| download | ruby-39fdca626dae71c15ed573bc8cb9e71b8d766549.tar.gz ruby-39fdca626dae71c15ed573bc8cb9e71b8d766549.tar.xz ruby-39fdca626dae71c15ed573bc8cb9e71b8d766549.zip | |
* test/minitest/test_mini_test.rb: fixed that r19958 made
test-all fail when the ruby was built at $(srcdir).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/minitest/test_mini_test.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -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 index 6c3a2c4b4..934de53fb 100644 --- a/test/minitest/test_mini_test.rb +++ b/test/minitest/test_mini_test.rb @@ -28,8 +28,10 @@ class TestMiniTest < MiniTest::Unit::TestCase 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'", |