From 1c4e5152ae4400409886e2e31f7dfbb6638b0495 Mon Sep 17 00:00:00 2001
From: Michael Matloob <matloob@golang.org>
Date: Mon, 13 Jan 2020 10:43:09 -0500
Subject: [PATCH] cmd/go: convert TestGoTestBuildsAnXtestContainingOnly... to
 the script framework

The name of the test is too long to fit on the first line. It's
TestGoTestBuildsAnXtestContainingOnlyNonRunnableExamples.

Part of converting all tests to script framework to improve
test parallelism.

Updates #36320
Updates #17751

Change-Id: I490748271b10a85cbe1d34f9dbecb86ccf0101a7
Reviewed-on: https://go-review.googlesource.com/c/go/+/214423
Reviewed-by: Jay Conrod <jayconrod@google.com>
---
 src/cmd/go/go_test.go                         |  7 -----
 .../go/testdata/norunexample/example_test.go  | 11 --------
 src/cmd/go/testdata/norunexample/test_test.go | 10 -------
 .../testdata/script/test_no_run_example.txt   | 26 +++++++++++++++++++
 4 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 src/cmd/go/testdata/norunexample/example_test.go
 delete mode 100644 src/cmd/go/testdata/norunexample/test_test.go
 create mode 100644 src/cmd/go/testdata/script/test_no_run_example.txt

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index a8ef36e6bbe2a..89b27b90b733f 100644
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -1832,13 +1832,6 @@ func TestListTemplateContextFunction(t *testing.T) {
 	}
 }
 
-func TestGoTestBuildsAnXtestContainingOnlyNonRunnableExamples(t *testing.T) {
-	tg := testgo(t)
-	defer tg.cleanup()
-	tg.run("test", "-v", "./testdata/norunexample")
-	tg.grepStdout("File with non-runnable example was built.", "file with non-runnable example was not built")
-}
-
 // Test that you cannot use a local import in a package
 // accessed by a non-local import (found in a GOPATH/GOROOT).
 // See golang.org/issue/17475.
diff --git a/src/cmd/go/testdata/norunexample/example_test.go b/src/cmd/go/testdata/norunexample/example_test.go
deleted file mode 100644
index e158305a6c8cd..0000000000000
--- a/src/cmd/go/testdata/norunexample/example_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package pkg_test
-
-import "os"
-
-func init() {
-	os.Stdout.Write([]byte("File with non-runnable example was built.\n"))
-}
-
-func Example_test() {
-	// This test will not be run, it has no "Output:" comment.
-}
diff --git a/src/cmd/go/testdata/norunexample/test_test.go b/src/cmd/go/testdata/norunexample/test_test.go
deleted file mode 100644
index d2e919838fb57..0000000000000
--- a/src/cmd/go/testdata/norunexample/test_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package pkg
-
-import (
-	"os"
-	"testing"
-)
-
-func TestBuilt(t *testing.T) {
-	os.Stdout.Write([]byte("A normal test was executed.\n"))
-}
diff --git a/src/cmd/go/testdata/script/test_no_run_example.txt b/src/cmd/go/testdata/script/test_no_run_example.txt
new file mode 100644
index 0000000000000..66daa310fa321
--- /dev/null
+++ b/src/cmd/go/testdata/script/test_no_run_example.txt
@@ -0,0 +1,26 @@
+go test -v norunexample
+stdout 'File with non-runnable example was built.'
+
+-- norunexample/example_test.go --
+package pkg_test
+
+import "os"
+
+func init() {
+	os.Stdout.Write([]byte("File with non-runnable example was built.\n"))
+}
+
+func Example_test() {
+	// This test will not be run, it has no "Output:" comment.
+}
+-- norunexample/test_test.go --
+package pkg
+
+import (
+	"os"
+	"testing"
+)
+
+func TestBuilt(t *testing.T) {
+	os.Stdout.Write([]byte("A normal test was executed.\n"))
+}