diff options
Diffstat (limited to 'testing/mage/fix-tests-for-go-1.16.patch')
| -rw-r--r-- | testing/mage/fix-tests-for-go-1.16.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/testing/mage/fix-tests-for-go-1.16.patch b/testing/mage/fix-tests-for-go-1.16.patch deleted file mode 100644 index 61d3c2b674e..00000000000 --- a/testing/mage/fix-tests-for-go-1.16.patch +++ /dev/null @@ -1,46 +0,0 @@ -From de7ca6c1087d653306bffde9c2c45afe060c46c5 Mon Sep 17 00:00:00 2001 -From: Nate Finch <nate.finch@gmail.com> -Date: Sat, 2 Jan 2021 23:34:01 -0500 -Subject: [PATCH] fix test for go 1.16 (#330) - -* fix test for 1.16 ---- - .travis.yml | 1 + - mage/main_test.go | 12 ++++++++++++ - 2 files changed, 13 insertions(+) - -diff --git a/.travis.yml b/.travis.yml -index dd15611..9a1bcc1 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -9,6 +9,7 @@ branches: - # library, I'm not going to worry about older versions for now. - go: - - tip -+ - 1.16beta1 - - 1.15.x - - 1.14.x - - 1.13.x -diff --git a/mage/main_test.go b/mage/main_test.go -index cf57da9..abee250 100644 ---- a/mage/main_test.go -+++ b/mage/main_test.go -@@ -1436,6 +1436,18 @@ func Test() { - } - stderr.Reset() - stdout.Reset() -+ -+ // we need to run go mod tidy, since go build will no longer auto-add dependencies. -+ cmd = exec.Command("go", "mod", "tidy") -+ cmd.Dir = dir -+ cmd.Env = os.Environ() -+ cmd.Stderr = stderr -+ cmd.Stdout = stdout -+ if err := cmd.Run(); err != nil { -+ t.Fatalf("Error running go mod tidy: %v\nStdout: %s\nStderr: %s", err, stdout, stderr) -+ } -+ stderr.Reset() -+ stdout.Reset() - code := Invoke(Invocation{ - Dir: dir, - Stderr: stderr, |