aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-07-07 20:03:15 -0500
committerJack Nagel2014-07-07 20:03:41 -0500
commit6664ec23dc0f2bc8d5b8fe4beb41e7a242dcc444 (patch)
treec6555b5178b9c04a3468a3ef836fe1fe22d3e4b0 /Library
parent23b4da18c22bd05345a8baabfcb0325908d18b63 (diff)
downloadbrew-6664ec23dc0f2bc8d5b8fe4beb41e7a242dcc444.tar.bz2
Merge should return self
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/build_environment.rb1
-rw-r--r--Library/Homebrew/test/test_build_environment.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/Library/Homebrew/build_environment.rb b/Library/Homebrew/build_environment.rb
index 4f4812bcd..618342a40 100644
--- a/Library/Homebrew/build_environment.rb
+++ b/Library/Homebrew/build_environment.rb
@@ -9,6 +9,7 @@ class BuildEnvironment
def merge(*args)
@settings.merge(*args)
+ self
end
def <<(o)
diff --git a/Library/Homebrew/test/test_build_environment.rb b/Library/Homebrew/test/test_build_environment.rb
index dff58f420..9452bf937 100644
--- a/Library/Homebrew/test/test_build_environment.rb
+++ b/Library/Homebrew/test/test_build_environment.rb
@@ -10,6 +10,10 @@ class BuildEnvironmentTests < Homebrew::TestCase
assert_same @env, (@env << :foo)
end
+ def test_merge_returns_self
+ assert_same @env, @env.merge([])
+ end
+
def test_std?
@env << :std
assert_predicate @env, :std?