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

diff --git a/src/cmd/gobuild/gobuild.c b/src/cmd/gobuild/gobuild.c
index 07a7862f6c650ca452dc9685e2a34bc6106ac4fe..55553ec364b2c5e5a71eff5b546e9bd295589b1c 100644 (file)
--- 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 f16d43cd5e5e9767d0c8af6a5dab4e6154122c0c..bf76c44eb6c5a5ffe1795c1dacaf2d48a270f562 100644 (file)
--- 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 39406223525709932a0b772d98701b09f62f26df..e8158189fb07f28abd965e331f05f9245e73eb49 100644 (file)
--- 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 57b06192e0dd378dbffbd3939bb38158809740ed..193d6259bfaf851b7cfcbce8258044632ec798cd 100644 (file)
--- 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 5bfa6adcfb61ada8274dbd51b0d7f9fcc306a2eb..b24dbca7a95a11b77fb8ad22d9439a7107abcd8d 100644 (file)
--- 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 8910e3aa39788128d85829a71c630298602f7867..3b0d2bd4368ea17609ed574a431904828268fe5b 100644 (file)
--- 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 ad789c8b0aeda30b92d80ff07c15024d4ae34e3a..954d1cc363a3364e61ad9a74f30dafff8799d9b8 100644 (file)
--- 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 d6fafc5c5f4ba1b71fccb9a4163b79efacc21744..708bce9ed2e817f13379b0e35914d9068611cce6 100644 (file)
--- 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 feb99e61dc2cb4fbaa09af89ed48f60bc21189a9..203413e5526d934db1f2d3130dfe0646e93f7cf5 100644 (file)
--- 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 ec4a5644e5f24128c4f47fefb212f7301135606e..6b63b7dcff43a2538ed3d7ab8d31e8627c9748db 100644 (file)
--- 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 8d9466963b5b27b6d5088d49dbf1ad4d74d65302..399360a936573393ec0e6866943b675ccae725d1 100644 (file)
--- 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 d74c0c24e4f26bff88e0079f1d6d017732b9775b..8dd3d2fe0fb0167c66a6fa88049b68aa8ef8d56a 100644 (file)
--- 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