test: use rundir and errorcheckdir for a few more tests.

Update #4139.

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/6620070

diff --git a/test/fixedbugs/bug083.go b/test/fixedbugs/bug083.go
index 8bdecaadb514247450b52d8460a0bc3c3a141447..54a17423a08415d8eb4803d463fdfc186770b04f 100644 (file)
--- a/test/fixedbugs/bug083.go
+++ b/test/fixedbugs/bug083.go
@@ -1,10 +1,7 @@
-// $G $D/$F.dir/bug0.go && errchk $G $D/$F.dir/bug1.go
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// errorcheckdir
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-ignored
+package ignored

diff --git a/test/fixedbugs/bug133.go b/test/fixedbugs/bug133.go
index a6baac26ca330062e65659a782a11dbd0e4c1bf2..54a17423a08415d8eb4803d463fdfc186770b04f 100644 (file)
--- a/test/fixedbugs/bug133.go
+++ b/test/fixedbugs/bug133.go
@@ -1,10 +1,7 @@
-// $G $D/$F.dir/bug0.go && $G $D/$F.dir/bug1.go && errchk $G $D/$F.dir/bug2.go
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// errorcheckdir
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-ignored
+package ignored

diff --git a/test/fixedbugs/bug160.go b/test/fixedbugs/bug160.go
index c5e166a0cf90a11c2d1b595fb8fb20e512cf3e94..fde797bfcd29e3d026f55f13a1f869fe6059615a 100644 (file)
--- a/test/fixedbugs/bug160.go
+++ b/test/fixedbugs/bug160.go
@@ -1,10 +1,7 @@
-// $G $D/bug160.dir/x.go && $G $D/bug160.dir/y.go && $L y.$A && ./$A.out
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// rundir
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-nothing to see here
+package ignored

diff --git a/test/fixedbugs/bug322.go b/test/fixedbugs/bug322.go
index 401a8600a9e066c8b1a65fdd7f2a978acff3f4b2..21efbb55935a3306dbadd006e6d1acd02586a1f0 100644 (file)
--- a/test/fixedbugs/bug322.go
+++ b/test/fixedbugs/bug322.go
@@ -1,11 +1,8 @@
-// $G $D/$F.dir/lib.go && $G $D/$F.dir/main.go && $L main.$A && ./$A.out || echo BUG: fails incorrectly
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// rundir
 
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Test case for issue 1402.
-ignored
+package ignored

diff --git a/test/fixedbugs/bug324.dir/main.go b/test/fixedbugs/bug324.dir/prog.go
similarity index 100%
rename from test/fixedbugs/bug324.dir/main.go
rename to test/fixedbugs/bug324.dir/prog.go

diff --git a/test/fixedbugs/bug324.go b/test/fixedbugs/bug324.go
index ee090ae42f46232e80711a0a872c8bdc628d6889..36b8b56d1235d56719d964c399e3d3cfede37114 100644 (file)
--- a/test/fixedbugs/bug324.go
+++ b/test/fixedbugs/bug324.go
@@ -1,11 +1,10 @@
-// $G $D/$F.dir/p.go && $G $D/$F.dir/main.go && $L main.$A && ./$A.out
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// rundir
 
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Test case for issue 1550
-ignored
+// Test case for issue 1550: a type cannot implement an interface
+// from another package with a private method, and type assertions
+// should fail.
+package ignored

diff --git a/test/fixedbugs/bug367.dir/main.go b/test/fixedbugs/bug367.dir/prog.go
similarity index 100%
rename from test/fixedbugs/bug367.dir/main.go
rename to test/fixedbugs/bug367.dir/prog.go

diff --git a/test/fixedbugs/bug367.go b/test/fixedbugs/bug367.go
index bf8edcd1b85e1bf13291479a4845865408df4919..05252cd9a6d4984f99661db5f6d2f644ab9a1f09 100644 (file)
--- a/test/fixedbugs/bug367.go
+++ b/test/fixedbugs/bug367.go
@@ -1,10 +1,10 @@
-// $G $D/$F.dir/p.go && $G $D/$F.dir/main.go && $L main.$A && ./$A.out || echo BUG: should not fail
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// rundir
 
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Issue 1536: bug when handling imported interfaces with
+// private methods.
+
 package ignored

diff --git a/test/fixedbugs/bug414.dir/main.go b/test/fixedbugs/bug414.dir/main.go
deleted file mode 100644 (file)
index 5200123..0000000
--- a/test/fixedbugs/bug414.dir/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-         package main
-       
-         import "./p1"
-       
-         type MyObject struct {
-           p1.Fer
-         }
-       
-         func main() {
-           var b p1.Fer = &p1.Object{}
-           p1.PrintFer(b)
-           var c p1.Fer = &MyObject{b}
-           p1.PrintFer(c)
-         }

diff --git a/test/fixedbugs/bug414.dir/p1.go b/test/fixedbugs/bug414.dir/p1.go
index 7768818bf9fb70bbd52c6710e1efbc3477b2f53e..246383484334f493d2954075a74fa7fffa756a40 100644 (file)
--- a/test/fixedbugs/bug414.dir/p1.go
+++ b/test/fixedbugs/bug414.dir/p1.go
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-         package p1
-       
-         import "fmt"
-       
-         type Fer interface {
-           f() string
-         }
-       
-         type Object struct {}
-       
-         func (this *Object) f() string {
-           return "Object.f"
-         }
-       
-         func PrintFer(fer Fer) {
-           fmt.Sprintln(fer.f())
-         }
+package p1
+
+import "fmt"
+
+type Fer interface {
+       f() string
+}
+
+type Object struct{}
+
+func (this *Object) f() string {
+       return "Object.f"
+}
+
+func PrintFer(fer Fer) {
+       fmt.Sprintln(fer.f())
+}

diff --git a/test/fixedbugs/bug414.dir/prog.go b/test/fixedbugs/bug414.dir/prog.go
new file mode 100644 (file)
index 0000000..f55d946
--- /dev/null
+++ b/test/fixedbugs/bug414.dir/prog.go
@@ -0,0 +1,18 @@
+// Copyright 2012 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import "./p1"
+
+type MyObject struct {
+       p1.Fer
+}
+
+func main() {
+       var b p1.Fer = &p1.Object{}
+       p1.PrintFer(b)
+       var c p1.Fer = &MyObject{b}
+       p1.PrintFer(c)
+}

diff --git a/test/fixedbugs/bug414.go b/test/fixedbugs/bug414.go
index 5612fd5c233315bbd1e5df8fecdeb37bfbda842c..35e19be38e20e3801e2ac2d0d24007be90c2211f 100644 (file)
--- a/test/fixedbugs/bug414.go
+++ b/test/fixedbugs/bug414.go
@@ -1,10 +1,9 @@
-// $G $D/$F.dir/p1.go && $G $D/$F.dir/main.go && $L main.$A && ./$A.out
-
-// NOTE: This test is not run by 'run.go' and so not run by all.bash.
-// To run this test you must use the ./run shell script.
+// rundir
 
 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Issue 1743: test embedding of imported types with private methods.
+
 package ignored

diff --git a/test/run.go b/test/run.go
index 49bcd96c94cf9c51e855b1609957ed01a13e3439..c22bfb2ec396ab4c96a7eaa1d3bec44e7285610e 100644 (file)
--- a/test/run.go
+++ b/test/run.go
@@ -672,22 +672,15 @@ var skipOkay = map[string]bool{
        "dwarf/z7.go":             true,
        "dwarf/z8.go":             true,
        "dwarf/z9.go":             true,
-       "fixedbugs/bug083.go":     true,
-       "fixedbugs/bug133.go":     true,
-       "fixedbugs/bug160.go":     true,
        "fixedbugs/bug191.go":     true,
-       "fixedbugs/bug248.go":     true,
-       "fixedbugs/bug302.go":     true,
-       "fixedbugs/bug313.go":     true,
-       "fixedbugs/bug322.go":     true,
-       "fixedbugs/bug324.go":     true,
-       "fixedbugs/bug345.go":     true,
-       "fixedbugs/bug367.go":     true,
+       "fixedbugs/bug248.go":     true, // combines errorcheckdir and rundir in the same dir.
+       "fixedbugs/bug302.go":     true, // tests both .$O and .a imports.
+       "fixedbugs/bug313.go":     true, // errorcheckdir with failures in the middle.
+       "fixedbugs/bug345.go":     true, // needs the appropriate flags in gc invocation.
        "fixedbugs/bug369.go":     true,
        "fixedbugs/bug382.go":     true,
        "fixedbugs/bug385_32.go":  true,
        "fixedbugs/bug385_64.go":  true,
-       "fixedbugs/bug414.go":     true,
        "fixedbugs/bug424.go":     true,
        "fixedbugs/bug429.go":     true,
        "fixedbugs/bug437.go":     true,