naruse	2013-12-23 19:00:16 +0900 (Mon, 23 Dec 2013)

  New Revision: 44365

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

  Log:
    merge revision(s) 44334: [Backport #9283]
    
    * test/rubygems/test_gem_ext_builder.rb:  Fix warning due to ambiguous
      expression.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/rubygems/test_gem_ext_builder.rb
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44364)
+++ ruby_2_1/ChangeLog	(revision 44365)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Dec 23 19:00:00 2013  Eric Hodel  <drbrain@s...>
+
+	* test/rubygems/test_gem_ext_builder.rb:  Fix warning due to ambiguous
+	  expression.
+
 Mon Dec 23 16:13:10 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems/commands/install_command.rb:  Restore gem install
Index: ruby_2_1/test/rubygems/test_gem_ext_builder.rb
===================================================================
--- ruby_2_1/test/rubygems/test_gem_ext_builder.rb	(revision 44364)
+++ ruby_2_1/test/rubygems/test_gem_ext_builder.rb	(revision 44365)
@@ -228,7 +228,7 @@ install: https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/rubygems/test_gem_ext_builder.rb#L228
 
     assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
-    assert_match /: No such file/,
+    assert_match %r%: No such file%,
                  File.read(gem_make_out)
 
     refute_path_exists @spec.gem_build_complete_path

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44334


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