aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-09-05 18:50:42 -0500
committerJack Nagel2013-09-05 18:51:27 -0500
commita871baadf56164a7e7edc6d26d0b836593e03892 (patch)
treeb569898f754a7c505dee2430e525bf18a3b23d11 /Library
parent896173a999df31b60c634706e0cc70d35bd858c5 (diff)
downloadbrew-a871baadf56164a7e7edc6d26d0b836593e03892.tar.bz2
Fix breakage in option recognition
Fixes Homebrew/homebrew#22347.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/build_options.rb2
-rw-r--r--Library/Homebrew/test/test_build_options.rb8
2 files changed, 7 insertions, 3 deletions
diff --git a/Library/Homebrew/build_options.rb b/Library/Homebrew/build_options.rb
index 441a81bc2..6400b36ce 100644
--- a/Library/Homebrew/build_options.rb
+++ b/Library/Homebrew/build_options.rb
@@ -107,7 +107,7 @@ class BuildOptions
end
def has_opposite_of? option
- true if args.include? opposite_of option
+ @options.include? opposite_of(option)
end
def opposite_of option
diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test_build_options.rb
index 9e2a9e06f..38eeae22b 100644
--- a/Library/Homebrew/test/test_build_options.rb
+++ b/Library/Homebrew/test/test_build_options.rb
@@ -1,9 +1,9 @@
- require 'testing_env'
+require 'testing_env'
require 'build_options'
class BuildOptionsTests < Test::Unit::TestCase
def setup
- args = %w{--with-foo --with-bar --without-qux} # args fake the command line
+ args = %w{--with-foo --with-bar --without-qux}
@build = BuildOptions.new(args)
@build.add("with-foo")
@build.add("with-bar")
@@ -67,4 +67,8 @@ class BuildOptionsTests < Test::Unit::TestCase
assert !@build.has_opposite_of?("--without-qux")
assert !@build.has_opposite_of?("--without-nonexisting")
end
+
+ def test_actually_recognizes_implicit_options
+ assert @build.has_opposite_of?("--with-baz")
+ end
end