From 70ceb851a596c4f40ccfb448d543bb5eb5089b4a Mon Sep 17 00:00:00 2001
From: Tim D. Smith
Date: Mon, 27 Jun 2016 23:25:10 -0700
Subject: Revert "test: Add test for Keg#mach_o_files hardlink behavior."

This reverts commit 62d7079684cdb568600e22531c62888622a71ff1.
---
 Library/Homebrew/test/test_keg.rb    | 15 ---------------
 Library/Homebrew/test/test_mach.rb   |  8 ++++++++
 Library/Homebrew/test/testing_env.rb |  8 --------
 3 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index 513707d45..9e4254667 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -304,19 +304,4 @@ class LinkTests < Homebrew::TestCase
     keg.unlink
     keg.uninstall
   end
-
-  def test_mach_o_files_skips_hardlinks
-    a = HOMEBREW_CELLAR.join("a", "1.0")
-    a.join("lib").mkpath
-    FileUtils.cp dylib_path("i386"), a.join("lib", "i386.dylib")
-    FileUtils.ln a.join("lib", "i386.dylib"), a.join("lib", "i386_link.dylib")
-
-    keg = Keg.new(a)
-    keg.link
-
-    assert_equal 1, keg.mach_o_files.size
-  ensure
-    keg.unlink
-    keg.uninstall
-  end
 end
diff --git a/Library/Homebrew/test/test_mach.rb b/Library/Homebrew/test/test_mach.rb
index 404a21d60..a1f62dcf3 100644
--- a/Library/Homebrew/test/test_mach.rb
+++ b/Library/Homebrew/test/test_mach.rb
@@ -1,6 +1,14 @@
 require "testing_env"
 
 class MachOPathnameTests < Homebrew::TestCase
+  def dylib_path(name)
+    Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.dylib")
+  end
+
+  def bundle_path(name)
+    Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle")
+  end
+
   def test_fat_dylib
     pn = dylib_path("fat")
     assert_predicate pn, :universal?
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 6be622cc5..4e7089e42 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -112,13 +112,5 @@ module Homebrew
       }
       refute exp.eql?(act), msg
     end
-
-    def dylib_path(name)
-      Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.dylib")
-    end
-
-    def bundle_path(name)
-      Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle")
-    end
   end
 end
-- 
cgit v1.2.3