Permalink
Browse files

* 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
  • Loading branch information...
1 parent 7799226 commit 844ddfdd0da7f06edfda1fa960fd1609d1264565 @unak unak committed May 8, 2012
Showing with 12 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +7 −2 test/minitest/metametameta.rb
View
@@ -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
@@ -26,8 +26,13 @@ def assert_report expected = nil
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

0 comments on commit 844ddfd

Please sign in to comment.