From 28918eac58eb6e2681d10839ac0d1430b2a4f1f9 Mon Sep 17 00:00:00 2001 From: drbrain Date: Wed, 16 Oct 2013 00:14:16 +0000 Subject: * lib/rubygems: Update to RubyGems master commit 2a74263. This fixes several bugs in RubyGems 2.2.0.preview.1. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_ext_cmake_builder.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'test/rubygems/test_gem_ext_cmake_builder.rb') diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index 24960144d7..b3e32977f4 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -57,13 +57,7 @@ install (FILES test.txt DESTINATION bin) shell_error_msg = %r{(CMake Error: .*)} sh_prefix_cmake = "cmake . -DCMAKE_INSTALL_PREFIX=" - expected = %r(cmake failed: - -#{Regexp.escape sh_prefix_cmake}#{Regexp.escape @dest_path} -#{shell_error_msg} -) - - assert_match expected, error.message + assert_match 'cmake failed', error.message assert_match %r%^#{sh_prefix_cmake}#{Regexp.escape @dest_path}%, output assert_match %r%#{shell_error_msg}%, output @@ -71,7 +65,7 @@ install (FILES test.txt DESTINATION bin) def test_self_build_has_makefile File.open File.join(@ext, 'Makefile'), 'w' do |makefile| - makefile.puts "all:\n\t@echo ok\ninstall:\n\t@echo ok" + makefile.puts "clean:\n\t@echo ok\nall:\n\t@echo ok\ninstall:\n\t@echo ok" end output = [] -- cgit v1.2.3