all: use ^$ instead of XXXX, NoSuchTestExists to match no tests

It's shorter and can't accidentally match unlikely test names.

Change-Id: I96dd9da018cad1acf604f266819470278f54c128
Reviewed-on: https://go-review.googlesource.com/c/go/+/524949
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/cmd/cgo/internal/test/issue18146.go b/src/cmd/cgo/internal/test/issue18146.go
index b9255234eb345f3f24c5ad6d1738b0c024a20669..112b7ee2e7373212c0113e2510933db4dd160724 100644 (file)
--- a/src/cmd/cgo/internal/test/issue18146.go
+++ b/src/cmd/cgo/internal/test/issue18146.go
@@ -72,7 +72,7 @@ func test18146(t *testing.T) {
                        }()
                }
                runtime.GOMAXPROCS(threads)
-               argv := append(os.Args, "-test.run=NoSuchTestExists")
+               argv := append(os.Args, "-test.run=^$")
                if err := syscall.Exec(os.Args[0], argv, os.Environ()); err != nil {
                        t.Fatal(err)
                }

diff --git a/src/cmd/go/testdata/script/test_fuzz_minimize_interesting.txt b/src/cmd/go/testdata/script/test_fuzz_minimize_interesting.txt
index e61c4f9d04eb9d3c8cee10d6ce3c073c82bb260c..11aaacaad26b07fba8ce0d9a7e7dbbe4f07e6afc 100644 (file)
--- a/src/cmd/go/testdata/script/test_fuzz_minimize_interesting.txt
+++ b/src/cmd/go/testdata/script/test_fuzz_minimize_interesting.txt
@@ -21,7 +21,7 @@ go run check_cache/check_cache.go $GOCACHE/fuzz/FuzzMinCache
 # Test that minimization occurs for a crash that appears while minimizing a
 # newly found interesting input. There must be only one worker for this test to
 # be flaky like we want.
-! exec ./fuzz.test$GOEXE -test.fuzzcachedir=$GOCACHE/fuzz -test.fuzz=FuzzMinimizerCrashInMinimization -test.run=XXX -test.fuzztime=10000x -test.parallel=1
+! exec ./fuzz.test$GOEXE -test.fuzzcachedir=$GOCACHE/fuzz -test.fuzz=FuzzMinimizerCrashInMinimization -test.run=^$ -test.fuzztime=10000x -test.parallel=1
 ! stdout '^ok'
 stdout -count=1 'got the minimum size!'
 stdout -count=1 'bad input'
@@ -32,7 +32,7 @@ go run check_testdata/check_testdata.go FuzzMinimizerCrashInMinimization 1
 
 # Test that a nonrecoverable error that occurs while minimizing an interesting
 # input is reported correctly.
-! exec ./fuzz.test$GOEXE -test.fuzzcachedir=$GOCACHE/fuzz -test.fuzz=FuzzMinimizerNonrecoverableCrashInMinimization -test.run=XXX -test.fuzztime=10000x -test.parallel=1
+! exec ./fuzz.test$GOEXE -test.fuzzcachedir=$GOCACHE/fuzz -test.fuzz=FuzzMinimizerNonrecoverableCrashInMinimization -test.run=^$ -test.fuzztime=10000x -test.parallel=1
 ! stdout '^ok'
 stdout -count=1 'fuzzing process hung or terminated unexpectedly while minimizing'
 stdout -count=1 'EOF'

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 2473a88056c96bd15797d1d0ea6dad3f26b0f9d5..f26a6b3190a442d9396a4f1f74a5c1fa6966dd68 100644 (file)
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -4992,7 +4992,7 @@ func benchmarkClientServerParallel(b *testing.B, parallelism int, mode testMode)
 // For use like:
 //
 //     $ go test -c
-//     $ ./http.test -test.run=XX -test.bench='^BenchmarkServer$' -test.benchtime=15s -test.cpuprofile=http.prof
+//     $ ./http.test -test.run='^$' -test.bench='^BenchmarkServer$' -test.benchtime=15s -test.cpuprofile=http.prof
 //     $ go tool pprof http.test http.prof
 //     (pprof) web
 func BenchmarkServer(b *testing.B) {
@@ -5031,7 +5031,7 @@ func BenchmarkServer(b *testing.B) {
        defer ts.Close()
        b.StartTimer()
 
-       cmd := testenv.Command(b, os.Args[0], "-test.run=XXXX", "-test.bench=^BenchmarkServer$")
+       cmd := testenv.Command(b, os.Args[0], "-test.run=^$", "-test.bench=^BenchmarkServer$")
        cmd.Env = append([]string{
                fmt.Sprintf("TEST_BENCH_CLIENT_N=%d", b.N),
                fmt.Sprintf("TEST_BENCH_SERVER_URL=%s", ts.URL),
@@ -5086,7 +5086,7 @@ func BenchmarkClient(b *testing.B) {
 
        // Start server process.
        ctx, cancel := context.WithCancel(context.Background())
-       cmd := testenv.CommandContext(b, ctx, os.Args[0], "-test.run=XXXX", "-test.bench=^BenchmarkClient$")
+       cmd := testenv.CommandContext(b, ctx, os.Args[0], "-test.run=^$", "-test.bench=^BenchmarkClient$")
        cmd.Env = append(cmd.Environ(), "TEST_BENCH_SERVER=yes")
        cmd.Stderr = os.Stderr
        stdout, err := cmd.StdoutPipe()

diff --git a/src/os/executable_test.go b/src/os/executable_test.go
index c835bb436baa018ede9ce54b3bed7e5b21f95d83..98b72d7d5e42d032b799618c797276aec53f1011 100644 (file)
--- a/src/os/executable_test.go
+++ b/src/os/executable_test.go
@@ -30,7 +30,7 @@ func TestExecutable(t *testing.T) {
                t.Fatalf("filepath.Rel: %v", err)
        }
 
-       cmd := testenv.Command(t, fn, "-test.run=XXXX")
+       cmd := testenv.Command(t, fn, "-test.run=^$")
        // make child start with a relative program path
        cmd.Dir = dir
        cmd.Path = fn