usa	2012-11-30 23:43:10 +0900 (Fri, 30 Nov 2012)

  New Revision: 38066

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

  Log:
    * test/rubygems/test_gem_installer.rb
      (TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
      if the executable to be overwritten was generated by rubygems, the
      error messsage differs from the only copied one's.

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_gem_installer.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38065)
+++ ChangeLog	(revision 38066)
@@ -1,3 +1,10 @@
+Fri Nov 30 23:39:58 2012  NAKAMURA Usaku  <usa@r...>
+
+	* test/rubygems/test_gem_installer.rb
+	  (TestGemInstaller#test_check_executable_overwrite_default_bin_dir):
+	  if the executable to be overwritten was generated by rubygems, the
+	  error messsage differs from the only copied one's.
+
 Fri Nov 30 23:27:26 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/rubygems/test_gem_ext_ext_conf_builder.rb
Index: test/rubygems/test_gem_installer.rb
===================================================================
--- test/rubygems/test_gem_installer.rb	(revision 38065)
+++ test/rubygems/test_gem_installer.rb	(revision 38066)
@@ -180,7 +180,7 @@
       end
 
       conflicted = File.join @gemhome, 'bin', 'executable'
-      assert_equal "\"executable\" from a conflicts with #{conflicted}",
+      assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/,
                    e.message
     end
   ensure

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