Merge pull request #6235 from ipfs/fix/macos-fuse

build: fix macos build with fuse
ipfs · Apr 19, 2019 · 6b58b13 · 6b58b13
2 parents 61a0d1a + a3bdfd6
commit 6b58b13
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,14 +36,28 @@ defaults: &defaults
     - image: circleci/golang:1.12
 
 jobs:
+  gobuild:
+    <<: *defaults
+    steps:
+    - checkout
+    - *make_out_dirs
+    - *restore_gomod
+    - run:
+        command: make cmd/ipfs-try-build
+        environment:
+          TEST_NO_FUSE: 0
+    - run:
+        command: make cmd/ipfs-try-build
+        environment:
+          TEST_NO_FUSE: 1
+    - *store_gomod
   gotest:
     <<: *defaults
     steps:
     - checkout
     - *make_out_dirs
     - *restore_gomod
 
-    - run: make cmd/ipfs-try-build
     - run: |
         make -j 1 test/unit/gotest.junit.xml \
         && [[ ! $(jq -s -c 'map(select(.Action == "fail")) | .[]' test/unit/gotest.json) ]]
@@ -96,5 +110,6 @@ workflows:
   version: 2
   test:
     jobs:
+    - gobuild
     - gotest
     - sharness
diff --git a/fuse/node/mount_nofuse.go b/fuse/node/mount_nofuse.go
@@ -8,8 +8,6 @@ import (
 	core "github.com/ipfs/go-ipfs/core"
 )
 
-type errNeedFuseVersion error // used in tests, needed in OSX
-
 func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
 	return errors.New("not compiled in")
 }
diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go
@@ -5,6 +5,7 @@ package node
 import (
 	"io/ioutil"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -63,7 +64,7 @@ func TestExternalUnmount(t *testing.T) {
 	mkdir(t, ipnsDir)
 
 	err = Mount(node, ipfsDir, ipnsDir)
-	if _, ok := err.(errNeedFuseVersion); ok || err == fuse.ErrOSXFUSENotFound {
+	if strings.Contains(err.Error(), "unable to check fuse version") || err == fuse.ErrOSXFUSENotFound {
 		t.Skip(err)
 	}
 	if err != nil {

diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go
@@ -30,8 +30,6 @@ var platformFuseChecks = func(*core.IpfsNode) error {
 	return nil
 }
 
-type errNeedFuseVersion error // used in tests, needed in OSX
-
 func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
 	// check if we already have live mounts.
 	// if the user said "Mount", then there must be something wrong.

diff --git a/mk/golang.mk b/mk/golang.mk
@@ -46,6 +46,8 @@ test_go_test: $$(DEPS_GO)
 	$(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) ./...
 .PHONY: test_go_test
 
+test_go_build: $$(TEST_GO_BUILD)
+
 test_go_short: GOTFLAGS += -test.short
 test_go_short: test_go_test
 .PHONY: test_go_short
@@ -54,7 +56,7 @@ test_go_race: GOTFLAGS += -race
 test_go_race: test_go_test
 .PHONY: test_go_race
 
-test_go_expensive: test_go_test $$(TEST_GO_BUILD)
+test_go_expensive: test_go_test test_go_build
 .PHONY: test_go_expensive
 TEST_GO += test_go_expensive