Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore/macos sharness fixes #6988

Merged
merged 3 commits into from
Mar 12, 2020
Merged

Chore/macos sharness fixes #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0819fe6
Require go 1.14
ribasushi Mar 12, 2020
81cb535
Prevent `go fmt` check from failing under `make -j10 test`
ribasushi Mar 12, 2020
7b65c07
Simplify grep in test to pass on MacOS
ribasushi Mar 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/test-go-fmt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
2 changes: 1 addition & 1 deletion mk/golang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# golang utilities
GO_MIN_VERSION = 1.13
GO_MIN_VERSION = 1.14
export GO111MODULE=on


Expand Down
2 changes: 1 addition & 1 deletion test/sharness/t0001-tests-work.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down