From c0a01e966543dc1bdbbfe039c516098cc0e218cb Mon Sep 17 00:00:00 2001
From: Rob Pike <r@golang.org>
Date: Wed, 19 Nov 2008 19:43:32 -0800
Subject: [PATCH] refine gobuild: the files must be *_test.go not *test.go this
 causes complications

R=rsc
DELTA=1724  (849 added, 856 deleted, 19 changed)
OCL=19667
CL=19667
---
 src/cmd/gobuild/gobuild.c                |  4 ++--
 src/lib/container/array/Makefile         |  2 +-
 src/lib/fmt/Makefile                     |  2 +-
 src/lib/http/Makefile                    |  2 +-
 src/lib/math/Makefile                    |  2 +-
 src/lib/net/Makefile                     | 21 +++++++--------------
 src/lib/os/Makefile                      |  6 +++---
 src/lib/reflect/Makefile                 |  2 +-
 src/lib/reflect/{test.go => all_test.go} | 10 +++++-----
 src/lib/regexp/Makefile                  |  2 +-
 src/lib/regexp/{test.go => all_test.go}  |  0
 src/lib/strconv/Makefile                 |  2 +-
 src/lib/syscall/Makefile                 |  2 +-
 13 files changed, 25 insertions(+), 32 deletions(-)
 rename src/lib/reflect/{test.go => all_test.go} (96%)
 rename src/lib/regexp/{test.go => all_test.go} (100%)

diff --git a/src/cmd/gobuild/gobuild.c b/src/cmd/gobuild/gobuild.c
index 07a7862f6c..55553ec364 100644
--- a/src/cmd/gobuild/gobuild.c
+++ b/src/cmd/gobuild/gobuild.c
@@ -290,7 +290,7 @@ char preamble[] =
 	"\n"
 	"coverage: packages\n"
 	"\tgotest\n"
-	"\t6cov -g `pwd` | grep -v '^.*test\\.go:'\n"
+	"\t6cov -g `pwd` | grep -v '_test\\.go:'\n"
 	"\n"
 	"%%.$O: %%.go\n"
 	"\t$(GC) $*.go\n"
@@ -487,7 +487,7 @@ main(int argc, char **argv)
 	njob = 0;
 	job = emalloc(argc*sizeof job[0]);
 	for(i=0; i<argc; i++) {
-		if(strstr(argv[i], "test.go") != nil)
+		if(suffix(argv[i], "_test.go") != nil)
 			continue;
 		job[njob].name = argv[i];
 		job[njob].pass = -1;
diff --git a/src/lib/container/array/Makefile b/src/lib/container/array/Makefile
index f16d43cd5e..bf76c44eb6 100644
--- a/src/lib/container/array/Makefile
+++ b/src/lib/container/array/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^.*test\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/fmt/Makefile b/src/lib/fmt/Makefile
index 3940622352..e8158189fb 100644
--- a/src/lib/fmt/Makefile
+++ b/src/lib/fmt/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^test.*\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/http/Makefile b/src/lib/http/Makefile
index 57b06192e0..193d6259bf 100644
--- a/src/lib/http/Makefile
+++ b/src/lib/http/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^test.*\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/math/Makefile b/src/lib/math/Makefile
index 5bfa6adcfb..b24dbca7a9 100644
--- a/src/lib/math/Makefile
+++ b/src/lib/math/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^.*test\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/net/Makefile b/src/lib/net/Makefile
index 8910e3aa39..3b0d2bd436 100644
--- a/src/lib/net/Makefile
+++ b/src/lib/net/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^test.*\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
@@ -32,35 +32,29 @@ coverage: packages
 	$(AS) $*.s
 
 O1=\
+	fd_$(GOOS).$O\
 	ip.$O\
 
 O2=\
-	fd_$(GOOS).$O\
+	fd.$O\
 	net_$(GOOS).$O\
 
 O3=\
-	fd.$O\
-
-O4=\
 	net.$O\
 
-net.a: a1 a2 a3 a4
+net.a: a1 a2 a3
 
 a1:	$(O1)
-	$(AR) grc net.a ip.$O
+	$(AR) grc net.a fd_$(GOOS).$O ip.$O
 	rm -f $(O1)
 
 a2:	$(O2)
-	$(AR) grc net.a fd_$(GOOS).$O net_$(GOOS).$O
+	$(AR) grc net.a fd.$O net_$(GOOS).$O
 	rm -f $(O2)
 
 a3:	$(O3)
-	$(AR) grc net.a fd.$O
-	rm -f $(O3)
-
-a4:	$(O4)
 	$(AR) grc net.a net.$O
-	rm -f $(O4)
+	rm -f $(O3)
 
 newpkg: clean
 	$(AR) grc net.a
@@ -68,7 +62,6 @@ newpkg: clean
 $(O1): newpkg
 $(O2): a1
 $(O3): a2
-$(O4): a3
 
 nuke: clean
 	rm -f $(GOROOT)/pkg/net.a
diff --git a/src/lib/os/Makefile b/src/lib/os/Makefile
index ad789c8b0a..954d1cc363 100644
--- a/src/lib/os/Makefile
+++ b/src/lib/os/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^test.*\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
@@ -35,9 +35,9 @@ O1=\
 	os_error.$O\
 
 O2=\
-	os_env.$O\
 	os_file.$O\
 	os_time.$O\
+	os_env.$O\
 
 os.a: a1 a2
 
@@ -46,7 +46,7 @@ a1:	$(O1)
 	rm -f $(O1)
 
 a2:	$(O2)
-	$(AR) grc os.a os_env.$O os_file.$O os_time.$O
+	$(AR) grc os.a os_file.$O os_time.$O os_env.$O
 	rm -f $(O2)
 
 newpkg: clean
diff --git a/src/lib/reflect/Makefile b/src/lib/reflect/Makefile
index d6fafc5c5f..708bce9ed2 100644
--- a/src/lib/reflect/Makefile
+++ b/src/lib/reflect/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^.*test\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/reflect/test.go b/src/lib/reflect/all_test.go
similarity index 96%
rename from src/lib/reflect/test.go
rename to src/lib/reflect/all_test.go
index feb99e61dc..203413e552 100644
--- a/src/lib/reflect/test.go
+++ b/src/lib/reflect/all_test.go
@@ -175,24 +175,24 @@ export func TestAll(tt *testing.T) {	// TODO(r): wrap up better
 		type C chan *T;	// TODO: should not be necessary
 		var tmp = new(C);
 		value := reflect.NewValue(tmp);
-		assert(reflect.ValueToString(value), "*reflect.C·test(@)");
+		assert(reflect.ValueToString(value), "*reflect.C·all_test(@)");
 	}
 	{
 		type A [10]int;
 		var tmp A = A{1,2,3,4,5,6,7,8,9,10};
 		value := reflect.NewValue(&tmp);
-		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.A·test{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}");
+		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.A·all_test{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}");
 		value.(reflect.PtrValue).Sub().(reflect.ArrayValue).Elem(4).(reflect.IntValue).Set(123);
-		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.A·test{1, 2, 3, 4, 123, 6, 7, 8, 9, 10}");
+		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.A·all_test{1, 2, 3, 4, 123, 6, 7, 8, 9, 10}");
 	}
 	{
 		type AA []int;
 		tmp1 := [10]int{1,2,3,4,5,6,7,8,9,10};	// TODO: should not be necessary to use tmp1
 		var tmp *AA = &tmp1;
 		value := reflect.NewValue(tmp);
-		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.AA·test{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}");
+		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.AA·all_test{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}");
 		value.(reflect.PtrValue).Sub().(reflect.ArrayValue).Elem(4).(reflect.IntValue).Set(123);
-		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.AA·test{1, 2, 3, 4, 123, 6, 7, 8, 9, 10}");
+		assert(reflect.ValueToString(value.(reflect.PtrValue).Sub()), "reflect.AA·all_test{1, 2, 3, 4, 123, 6, 7, 8, 9, 10}");
 	}
 
 	{
diff --git a/src/lib/regexp/Makefile b/src/lib/regexp/Makefile
index ec4a5644e5..6b63b7dcff 100644
--- a/src/lib/regexp/Makefile
+++ b/src/lib/regexp/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^.*test\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/regexp/test.go b/src/lib/regexp/all_test.go
similarity index 100%
rename from src/lib/regexp/test.go
rename to src/lib/regexp/all_test.go
diff --git a/src/lib/strconv/Makefile b/src/lib/strconv/Makefile
index 8d9466963b..399360a936 100644
--- a/src/lib/strconv/Makefile
+++ b/src/lib/strconv/Makefile
@@ -20,7 +20,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^.*test\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
diff --git a/src/lib/syscall/Makefile b/src/lib/syscall/Makefile
index d74c0c24e4..8dd3d2fe0f 100644
--- a/src/lib/syscall/Makefile
+++ b/src/lib/syscall/Makefile
@@ -22,7 +22,7 @@ test: packages
 
 coverage: packages
 	gotest
-	6cov -g `pwd` | grep -v '^test.*\.go:'
+	6cov -g `pwd` | grep -v '_test\.go:'
 
 %.$O: %.go
 	$(GC) $*.go
-- 
2.50.0