Merge pull request #6988 from ipfs/chore/macos_sharness_fixes

Chore/macos sharness fixes
ipfs · Mar 12, 2020 · fe83c19 · fe83c19
2 parents 755d359 + 7b65c07
commit fe83c19
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/test-go-fmt b/bin/test-go-fmt
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 T="$(mktemp)"
-find . -name '*.go' | xargs gofmt -l > "$T"
+find . -name '*.go' '!' -path ./plugin/loader/preload.go | xargs gofmt -l > "$T"
 
 if [ -n "$(cat $T)" ]; then
 	echo "Following Go code is not formatted."

diff --git a/mk/golang.mk b/mk/golang.mk
@@ -1,5 +1,5 @@
 # golang utilities
-GO_MIN_VERSION = 1.13
+GO_MIN_VERSION = 1.14
 export GO111MODULE=on
 
 

diff --git a/test/sharness/t0001-tests-work.sh b/test/sharness/t0001-tests-work.sh
@@ -10,7 +10,7 @@ for file in $(find ..  -maxdepth 1 -name 't*.sh' -type f); do
     '
 
     test_expect_success "test in $file has a description" '
-              test_must_fail grep -L "^test_description=" "$file"
+              grep -q "^test_description=" "$file"
             '
 
     # We have some tests that manually kill.