From 0819fe6f4a37235cd33dd1cba78e8d4b1d146c3c Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@protocol.ai>
Date: Thu, 12 Mar 2020 04:25:13 +0100
Subject: [PATCH 1/3] Require go 1.14

A dependency of ours now requires 1.14, let's be more explicit ourselves

../../go/pkg/mod/github.com/lucas-clemente/quic-go@v0.15.2/interface.go:54:2: duplicate method StreamID
../../go/pkg/mod/github.com/lucas-clemente/quic-go@v0.15.2/stream.go:44:2: duplicate method StreamID
note: module requires Go 1.14
---
 mk/golang.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/golang.mk b/mk/golang.mk
index f2b7a71b8..0aff6c12a 100644
--- 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
 
 

From 81cb535c52e07aaceb17461f8495c56b86bb5964 Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@protocol.ai>
Date: Thu, 12 Mar 2020 04:41:09 +0100
Subject: [PATCH 2/3] Prevent `go fmt` check from failing under `make -j10
 test`

Under high paralellism we would be regenerating the plugin source
while doing the initial `go fmt` read.

Instead simply exclude the generated file.
---
 bin/test-go-fmt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/test-go-fmt b/bin/test-go-fmt
index 8bc7d2e66..5b17f2d5c 100755
--- 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."

From 7b65c0703f7a98260779f773f92173e33f43979b Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@protocol.ai>
Date: Thu, 12 Mar 2020 04:42:53 +0100
Subject: [PATCH 3/3] Simplify grep in test to pass on MacOS

---
 test/sharness/t0001-tests-work.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sharness/t0001-tests-work.sh b/test/sharness/t0001-tests-work.sh
index 79557e109..6394fed77 100755
--- 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.