summaryrefslogtreecommitdiff
path: root/test/rubygems/test_gem_ext_configure_builder.rb
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-25 13:28:57 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-25 13:28:57 +0000
commit8cc31037224bca3e9b5c8e8f9ae206753a3822f8 (patch)
tree82ed31572cd801b8a5beae7f0577290f5f170034 /test/rubygems/test_gem_ext_configure_builder.rb
parent7565d728b6f3910cf41ce106bf0b7bc2aef2bc77 (diff)
* 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_configure_builder.rb')
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb
index 65d31f61af..6137795111 100644
--- a/test/rubygems/test_gem_ext_configure_builder.rb
+++ b/test/rubygems/test_gem_ext_configure_builder.rb
@@ -30,9 +30,9 @@ class TestGemExtConfigureBuilder < Gem::TestCase
assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
assert_equal "", output.shift
- assert_equal make_command, output.shift
+ assert_contains_make_command '', output.shift
assert_match(/^ok$/m, output.shift)
- assert_equal make_command + " install", output.shift
+ assert_contains_make_command 'install', output.shift
assert_match(/^ok$/m, output.shift)
end
@@ -76,8 +76,8 @@ class TestGemExtConfigureBuilder < Gem::TestCase
Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
end
- assert_equal make_command, output[0]
- assert_equal "#{make_command} install", output[2]
+ assert_contains_make_command '', output[0]
+ assert_contains_make_command 'install', output[2]
end
end