From 844ddfdd0da7f06edfda1fa960fd1609d1264565 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 8 May 2012 02:23:15 +0000 Subject: * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report): support drive letter on Windows. yes, the original code is metameta. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/minitest/metametameta.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test/minitest') diff --git a/test/minitest/metametameta.rb b/test/minitest/metametameta.rb index 4352cfee82..035ee77ab4 100644 --- a/test/minitest/metametameta.rb +++ b/test/minitest/metametameta.rb @@ -26,8 +26,13 @@ class MetaMetaMetaTestCase < MiniTest::Unit::TestCase output = @output.string.dup output.sub!(/Finished tests in .*/, "Finished tests in 0.00") output.sub!(/Loaded suite .*/, 'Loaded suite blah') - output.gsub!(/\[[^\]:]+:\d+\]/, '[FILE:LINE]') - output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in') + if /mswin|mingw/ =~ RUBY_PLATFORM + output.gsub!(/\[(?:[A-Za-z]:)?[^\]:]+:\d+\]/, '[FILE:LINE]') + output.gsub!(/^(\s+)(?:[A-Za-z]:)?[^:]+:\d+:in/, '\1FILE:LINE:in') + else + output.gsub!(/\[[^\]:]+:\d+\]/, '[FILE:LINE]') + output.gsub!(/^(\s+)[^:]+:\d+:in/, '\1FILE:LINE:in') + end assert_equal(expected, output) end -- cgit v1.2.3