[前][次][番号順一覧][スレッド一覧]

ruby-changes:23536

From: usa <ko1@a...>
Date: Tue, 8 May 2012 11:23:27 +0900 (JST)
Subject: [ruby-changes:23536] usa:r35587 (trunk): * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report):

usa	2012-05-08 11:23:15 +0900 (Tue, 08 May 2012)

  New Revision: 35587

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

  Log:
    * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report):
      support drive letter on Windows.  yes, the original code is metameta.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35586)
+++ ChangeLog	(revision 35587)
@@ -1,3 +1,8 @@
+Tue May  8 11:21:27 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@s...>
 
 	* lib/abbrev.rb:  Fixed typo in abbrev pattern documentation.  Based on
Index: test/minitest/metametameta.rb
===================================================================
--- test/minitest/metametameta.rb	(revision 35586)
+++ test/minitest/metametameta.rb	(revision 35587)
@@ -26,8 +26,13 @@
     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
 

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

[前][次][番号順一覧][スレッド一覧]