From e37f39054d7cdde7b27bcac1ca1b295dea6dbd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 13 Feb 2023 11:35:53 +0000 Subject: [PATCH] update testscript to support code coverage with Go 1.20 See https://github.com/rogpeppe/go-internal/pull/201. --- go.mod | 2 +- go.sum | 3 ++- main_test.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 52cf79b..b0451d8 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/bluekeyes/go-gitdiff v0.7.0 github.com/frankban/quicktest v1.14.4 github.com/google/go-cmp v0.5.9 - github.com/rogpeppe/go-internal v1.9.0 + github.com/rogpeppe/go-internal v1.9.1-0.20230209130841-f0583b8402aa golang.org/x/exp v0.0.0-20230206171751-46f607a40771 golang.org/x/mod v0.7.0 golang.org/x/tools v0.5.0 diff --git a/go.sum b/go.sum index 177acdf..7f61b00 100644 --- a/go.sum +++ b/go.sum @@ -11,8 +11,9 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.9.1-0.20230209130841-f0583b8402aa h1:ffzRZUxPxKUZiv+XButQiigyMv4dEvynFqEYbkFsHDw= +github.com/rogpeppe/go-internal v1.9.1-0.20230209130841-f0583b8402aa/go.mod h1:4DOBFiuQsmS6qjl8rsAMyM0e8miaqS/Wnm+9jQ5RiOU= golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= diff --git a/main_test.go b/main_test.go index 6200521..b30582a 100644 --- a/main_test.go +++ b/main_test.go @@ -94,7 +94,7 @@ func TestScript(t *testing.T) { "GARBLE_CACHE_DIR="+userCacheDir, ) - if os.Getenv("TESTSCRIPT_COVER_DIR") != "" { + if os.Getenv("GOCOVERDIR") != "" { // Don't reuse the build cache if we want to collect // code coverage. Otherwise, many toolexec calls would // be avoided and the coverage would be incomplete.