diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/minitest/metametameta.rb | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue May 8 11:21:27 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report): + support drive letter on Windows. yes, the original code is metameta. + Tue May 8 08:54:48 2012 Eric Hodel <drbrain@segment7.net> * lib/abbrev.rb: Fixed typo in abbrev pattern documentation. Based on 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 |