From 05c56ca0a42fe0e0bc4e428cb7077995d8279aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 16 Aug 2020 11:55:48 +0200
Subject: [PATCH] testdata: set GOPRIVATE in all but two tests

basic.txt just builds main.go without a module. Similarly, we leave
imports.txt without a GOPRIVATE, to test the 'go list -m' fallback.

For all other tests, explicitly set GOPRIVATE, to avoid two exec calls -
both 'go env GOPRIVATE' as well as 'go list -m'. Each of those calls
takes in the order of 10ms, so saving ~26 exec calls should easily add
to 200-300ms saved from 'go test -short'.
---
 testdata/scripts/asm.txt       |  2 ++
 testdata/scripts/basic.txt     |  2 +-
 testdata/scripts/cgo.txt       |  2 ++
 testdata/scripts/debugdir.txt  | 10 ++++++----
 testdata/scripts/implement.txt |  2 ++
 testdata/scripts/imports.txt   |  3 +++
 testdata/scripts/ldflags.txt   |  3 +++
 testdata/scripts/literals.txt  |  2 ++
 testdata/scripts/modinfo.txt   |  2 ++
 testdata/scripts/panic.txt     |  2 ++
 testdata/scripts/plugin.txt    |  2 ++
 testdata/scripts/seed.txt      |  2 ++
 testdata/scripts/syntax.txt    | 17 +++++++++++------
 testdata/scripts/test.txt      |  3 +++
 testdata/scripts/tiny.txt      |  6 ++++--
 15 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/testdata/scripts/asm.txt b/testdata/scripts/asm.txt
index 05b842b..a730581 100644
--- a/testdata/scripts/asm.txt
+++ b/testdata/scripts/asm.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 garble build
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/basic.txt b/testdata/scripts/basic.txt
index 932cb94..66f9492 100644
--- a/testdata/scripts/basic.txt
+++ b/testdata/scripts/basic.txt
@@ -2,7 +2,7 @@
 ! exec go build -a -toolexec=garble main.go
 stderr 'should be used alongside -trimpath'
 
-# Check that the simplest use of garble works.
+# Check that the simplest use of garble works. Note the lack of a module or GOPRIVATE.
 garble build main.go
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/cgo.txt b/testdata/scripts/cgo.txt
index 370a410..c53d5ff 100644
--- a/testdata/scripts/cgo.txt
+++ b/testdata/scripts/cgo.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 garble build
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/debugdir.txt b/testdata/scripts/debugdir.txt
index 08df254..16b62fe 100644
--- a/testdata/scripts/debugdir.txt
+++ b/testdata/scripts/debugdir.txt
@@ -1,14 +1,16 @@
+env GOPRIVATE=test/main
+
 garble -debugdir ./test1 build
-exists 'test1/test/imported/imported.go' 'test1/main/main.go'
-! grep ImportedFunc $WORK/test1/test/imported/imported.go
+exists 'test1/test/main/imported/imported.go' 'test1/main/main.go'
+! grep ImportedFunc $WORK/test1/test/main/imported/imported.go
 ! grep ImportedFunc $WORK/test1/main/main.go
 
 -- go.mod --
-module test
+module test/main
 -- main.go --
 package main
 
-import "test/imported"
+import "test/main/imported"
 
 func main() {
 	imported.ImportedFunc()
diff --git a/testdata/scripts/implement.txt b/testdata/scripts/implement.txt
index 66695ee..ba4b10b 100644
--- a/testdata/scripts/implement.txt
+++ b/testdata/scripts/implement.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 garble build
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/imports.txt b/testdata/scripts/imports.txt
index 050f3b5..f5a274f 100644
--- a/testdata/scripts/imports.txt
+++ b/testdata/scripts/imports.txt
@@ -1,3 +1,6 @@
+# Note that this is the only test with a module where we rely on the detection
+# of GOPRIVATE.
+
 garble build -tags buildtag
 exec ./main
 cmp stdout main.stdout
diff --git a/testdata/scripts/ldflags.txt b/testdata/scripts/ldflags.txt
index baa0451..a712c31 100644
--- a/testdata/scripts/ldflags.txt
+++ b/testdata/scripts/ldflags.txt
@@ -1,3 +1,6 @@
+# Note the proper domain, since the dot adds an edge case.
+env GOPRIVATE=domain.test/main
+
 garble build -ldflags='-X=main.unexportedVersion=v1.0.0 -X=domain.test/main/imported.ExportedVar=replaced'
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/literals.txt b/testdata/scripts/literals.txt
index 13109d5..5aa2c1a 100644
--- a/testdata/scripts/literals.txt
+++ b/testdata/scripts/literals.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 # Generate and write random literals into a separate file
 generate-literals extraLiterals.go 500 printExtraLiterals
 
diff --git a/testdata/scripts/modinfo.txt b/testdata/scripts/modinfo.txt
index 91d58d4..8d7cc09 100644
--- a/testdata/scripts/modinfo.txt
+++ b/testdata/scripts/modinfo.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 garble build
 exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/panic.txt b/testdata/scripts/panic.txt
index 9424c69..5175a2c 100644
--- a/testdata/scripts/panic.txt
+++ b/testdata/scripts/panic.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 garble build
 ! exec ./main
 cmp stderr main.stderr
diff --git a/testdata/scripts/plugin.txt b/testdata/scripts/plugin.txt
index 039c3ea..0ef0869 100644
--- a/testdata/scripts/plugin.txt
+++ b/testdata/scripts/plugin.txt
@@ -1,5 +1,7 @@
 [windows] skip 'Go plugins are not supported on Windows'
 
+env GOPRIVATE=test/main
+
 garble build -buildmode=plugin ./plugin
 binsubstr plugin.so 'PublicVar' 'PublicFunc'
 ! binsubstr plugin.so 'privateFunc'
diff --git a/testdata/scripts/seed.txt b/testdata/scripts/seed.txt
index 8243c37..036e12c 100644
--- a/testdata/scripts/seed.txt
+++ b/testdata/scripts/seed.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 # Check the binary with a given base64 encoded seed
 garble -literals -seed=OQg9kACEECQ= build
 exec ./main$exe
diff --git a/testdata/scripts/syntax.txt b/testdata/scripts/syntax.txt
index 41e6d67..af3fc1b 100644
--- a/testdata/scripts/syntax.txt
+++ b/testdata/scripts/syntax.txt
@@ -1,9 +1,4 @@
-go build
-exec ./main$exe
-cmp stderr main.stderr
-
-binsubstr main$exe 'globalVar' # 'globalType' only matches on go < 1.15
-! binsubstr main$exe 'localName' 'globalConst'
+env GOPRIVATE=test/main
 
 garble -debugdir=debug build
 exec ./main$exe
@@ -13,6 +8,16 @@ cmp stderr main.stderr
 
 binsubstr debug/main/scopes.go 'localName' 'globalConst'
 
+[short] stop # no need to verify this with -short
+
+go build
+exec ./main$exe
+cmp stderr main.stderr
+
+binsubstr main$exe 'globalVar' # 'globalType' only matches on go < 1.15
+! binsubstr main$exe 'localName' 'globalConst'
+
+
 -- go.mod --
 module test/main
 -- main.go --
diff --git a/testdata/scripts/test.txt b/testdata/scripts/test.txt
index 2459afa..80a1d39 100644
--- a/testdata/scripts/test.txt
+++ b/testdata/scripts/test.txt
@@ -1,3 +1,6 @@
+# Note that we need bar_test too.
+env GOPRIVATE=test/bar,test/bar_test
+
 # build the test binary
 garble test -c
 binsubstr bar.test$exe 'TestFoo' 'TestSeparateFoo'
diff --git a/testdata/scripts/tiny.txt b/testdata/scripts/tiny.txt
index d86b724..4ff9784 100644
--- a/testdata/scripts/tiny.txt
+++ b/testdata/scripts/tiny.txt
@@ -1,3 +1,5 @@
+env GOPRIVATE=test/main
+
 env TINY_PATTERN='^\/\/line :1$'
 env DEFAULT_PATTERN='^\/\/line \w\.go:[1-9][0-9]*$'
 env DEFAULT_STACK_PATTERN='^\t\w\.go:[1-9][0-9]*(\s\+0x[0-9a-f]+)?'
@@ -32,10 +34,10 @@ grep $DEFAULT_PATTERN .obf-src/main/main.go
 stderr $DEFAULT_STACK_PATTERN
 
 -- go.mod --
-module main
+module test/main
 -- main.go --
 package main
 
 func main() {
 	panic("Test")
-}
\ No newline at end of file
+}