From 30524ea2827294941f0d23afa30c8848fd85bd7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 15 Dec 2019 11:45:57 +0000
Subject: [PATCH] shorten 'go test -short' run time

Down from ~11s to ~7s, as we can skip some extra checks.

While at it, avoid duplicate 'go test' builds in test.txt.
---
 testdata/scripts/basic.txt   | 2 ++
 testdata/scripts/imports.txt | 2 ++
 testdata/scripts/test.txt    | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/testdata/scripts/basic.txt b/testdata/scripts/basic.txt
index 809312f..d9fd2be 100644
--- a/testdata/scripts/basic.txt
+++ b/testdata/scripts/basic.txt
@@ -28,6 +28,8 @@ cmp stderr main.stderr
 
 ! bingrep main$exe ${WORK@R} 'globalVar' 'globalFunc'
 
+[short] stop # checking that the build is reproducible is slow
+
 # Finally, check that the 'garble build' shortcut works, and produces the same
 # binary.
 cp main$exe main_old$exe
diff --git a/testdata/scripts/imports.txt b/testdata/scripts/imports.txt
index 9b81579..fbfb0db 100644
--- a/testdata/scripts/imports.txt
+++ b/testdata/scripts/imports.txt
@@ -4,6 +4,8 @@ cmp stdout main.stdout
 
 ! bingrep main$exe 'ImportedVar' 'ImportedConst' 'ImportedFunc' 'ImportedType'
 
+[short] stop # checking that the build is reproducible is slow
+
 # Also check that the binary is reproducible when many imports are involved.
 cp main$exe main_old$exe
 rm main$exe
diff --git a/testdata/scripts/test.txt b/testdata/scripts/test.txt
index 876abeb..e0e24d9 100644
--- a/testdata/scripts/test.txt
+++ b/testdata/scripts/test.txt
@@ -1,13 +1,13 @@
 exec go test -v
 stdout 'PASS.*TestFoo'
 
-garble test -v
-stdout 'PASS.*TestFoo'
-
 garble test -c -vet=off
 bingrep bar.test$exe 'TestFoo'
 ! bingrep bar.test$exe 'ImportedVar'
 
+exec ./bar.test -test.v
+stdout 'PASS.*TestFoo'
+
 -- go.mod --
 module foo.com/bar
 -- bar.go --