diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-25 13:28:57 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-25 13:28:57 +0000 |
commit | 8cc31037224bca3e9b5c8e8f9ae206753a3822f8 (patch) | |
tree | 82ed31572cd801b8a5beae7f0577290f5f170034 /test/rubygems/test_gem_ext_cmake_builder.rb | |
parent | 7565d728b6f3910cf41ce106bf0b7bc2aef2bc77 (diff) | |
download | ruby-8cc31037224bca3e9b5c8e8f9ae206753a3822f8.tar.gz |
* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass
DESTDIR via command line to override what's in MAKEFLAGS. This
fixes an installation problem under a package building
environment where DESTDIR is specified in the (parent) command
line. [Fixes GH-327]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_ext_cmake_builder.rb')
-rw-r--r-- | test/rubygems/test_gem_ext_cmake_builder.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index 0e4f8fe0ff..24960144d7 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -38,8 +38,8 @@ install (FILES test.txt DESTINATION bin) assert_match \ %r%^cmake \. -DCMAKE_INSTALL_PREFIX=#{Regexp.escape @dest_path}%, output assert_match %r%#{Regexp.escape @ext}%, output - assert_match %r%^#{Regexp.escape make_command}$%, output - assert_match %r%^#{Regexp.escape make_command} install$%, output + assert_contains_make_command '', output + assert_contains_make_command 'install', output assert_match %r%test\.txt%, output end @@ -82,8 +82,8 @@ install (FILES test.txt DESTINATION bin) output = output.join "\n" - assert_match %r%^#{make_command}%, output - assert_match %r%^#{make_command} install%, output + assert_contains_make_command '', output + assert_contains_make_command 'install', output end end |