admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix tests and NoMethodError with no X11 installed.

Browse Source
This commit is contained in:
Mike McQuaid 2012-08-25 10:21:29 -07:00
parent d9a18d4c1e
commit 90010f4602
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/ENV.rb
View File

@ -301,9 +301,10 @@ Please take one of the following actions:
end end
end end
def x11 def x11 silent=false
unless MacOS::X11.installed? unless MacOS::X11.installed?
opoo "You do not have X11 installed, this formula may not build." opoo "You do not have X11 installed, this formula may not build." unless silent
return
end end
# There are some config scripts here that should go in the PATH # There are some config scripts here that should go in the PATH

2
Library/Homebrew/test/test_ENV.rb
View File

@ -15,7 +15,7 @@ class EnvironmentTests < Test::Unit::TestCase
ENV.minimal_optimization ENV.minimal_optimization
ENV.no_optimization ENV.no_optimization
ENV.libxml2 ENV.libxml2
ENV.x11 ENV.x11 true
ENV.enable_warnings ENV.enable_warnings
assert !ENV.cc.empty? assert !ENV.cc.empty?
assert !ENV.cxx.empty? assert !ENV.cxx.empty?