diff options
| author | Misty De Meo | 2016-04-20 14:26:39 -0700 |
|---|---|---|
| committer | Misty De Meo | 2016-04-21 09:36:30 -0700 |
| commit | f5f41f2079039699c0157b602391d7744fc7222b (patch) | |
| tree | d0a644720ec828462435a5c4669a9e59b98adda0 /Library/Homebrew | |
| parent | 35385e8c59c92b8993f99d6e73d9ab83c2ba3c4d (diff) | |
| download | brew-f5f41f2079039699c0157b602391d7744fc7222b.tar.bz2 | |
doctor: remove autotools check
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/diagnostic.rb | 16 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_diagnostic.rb | 14 |
2 files changed, 0 insertions, 30 deletions
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index b862cdaea..c0ecf018e 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -1100,22 +1100,6 @@ module Homebrew end end - def check_for_autoconf - return unless MacOS::Xcode.installed? - return unless MacOS::Xcode.provides_autotools? - - autoconf = which("autoconf") - safe_autoconfs = %w[/usr/bin/autoconf /Developer/usr/bin/autoconf] - return if autoconf.nil? || safe_autoconfs.include?(autoconf.to_s) - - <<-EOS.undent - An "autoconf" in your path blocks the Xcode-provided version at: - #{autoconf} - - This custom autoconf may cause some Homebrew formulae to fail to compile. - EOS - end - def __check_linked_brew(f) f.installed_prefixes.each do |prefix| prefix.find do |src| diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test_diagnostic.rb index d53747bc5..ef82da6dc 100644 --- a/Library/Homebrew/test/test_diagnostic.rb +++ b/Library/Homebrew/test/test_diagnostic.rb @@ -204,20 +204,6 @@ class DiagnosticChecksTest < Homebrew::TestCase HOMEBREW_CELLAR.mkpath end - def test_check_for_autoconf - MacOS::Xcode.stubs(:installed?).returns true - MacOS::Xcode.stubs(:provides_autotools?).returns true - mktmpdir do |path| - file = "#{path}/autoconf" - FileUtils.touch file - FileUtils.chmod 0755, file - ENV["PATH"] = [path, ENV["PATH"]].join File::PATH_SEPARATOR - - assert_match "This custom autoconf", - @checks.check_for_autoconf - end - end - def test_check_tmpdir ENV["TMPDIR"] = "/i/don/t/exis/t" assert_match "doesn't exist", |
