summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-23 10:00:16 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-23 10:00:16 +0000
commit92a3083ddb0a883f65398bc3fe38fdc81eb98de7 (patch)
tree46920d8398c43718bbade1990bdb265ecd0ecf4a
parent8680f4f8dec467afa58b6f993728d35c45fcefd6 (diff)
merge revision(s) 44334: [Backport #9283]
* test/rubygems/test_gem_ext_builder.rb: Fix warning due to ambiguous expression. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/rubygems/test_gem_ext_builder.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c3c635b426..0740af5187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 23 19:00:00 2013 Eric Hodel <drbrain@segment7.net>
+
+ * test/rubygems/test_gem_ext_builder.rb: Fix warning due to ambiguous
+ expression.
+
Mon Dec 23 16:13:10 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/commands/install_command.rb: Restore gem install
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index adb4ee4d0e..da040ea982 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -228,7 +228,7 @@ install:
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