Merge pull request #6617 from xu-cheng/arm

brew tests: fix for ARM

Library/Homebrew/formula_info.rb

@@ -13,7 +13,15 @@ class FormulaInfo
   # Looks up formula on disk and reads its info.
   # Returns nil if formula is absent or if there was an error reading it.
   def self.lookup(name)
-    json = Utils.popen_read(HOMEBREW_BREW_FILE, "info", "--json=v1", name)
+    json = Utils.popen_read(
+      RUBY_PATH,
+      "-W0",
+      "-I", $LOAD_PATH.join(File::PATH_SEPARATOR),
+      HOMEBREW_LIBRARY_PATH/"brew.rb",
+      "info",
+      "--json=v1",
+      name
+    )
 
     return unless $CHILD_STATUS.success?
 

Library/Homebrew/test/hardware/cpu_spec.rb

@@ -21,6 +21,7 @@ describe Hardware::CPU do
   describe "::family" do
     let(:cpu_families) {
       [
+        :arm,
         :arrandale,
         :atom,
         :broadwell,

Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.aarch64_linux.bottle.tar.gz

@@ -0,0 +1 @@
+testball_bottle-0.1.yosemite.bottle.tar.gz

Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.armv6_linux.bottle.tar.gz

@@ -0,0 +1 @@
+testball_bottle-0.1.yosemite.bottle.tar.gz

Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.armv7_linux.bottle.tar.gz

@@ -0,0 +1 @@
+testball_bottle-0.1.yosemite.bottle.tar.gz

Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.intel_macintosh.bottle.tar.gz

@@ -1 +1 @@
-/usr/local/Homebrew/Library/Homebrew/test/support/fixtures/bottles/testball_bottle-0.1.yosemite.bottle.tar.gz
+testball_bottle-0.1.yosemite.bottle.tar.gz