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 8bdecaa..54a17423 100644
--- 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 a6baac2..54a17423 100644
--- 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 c5e166a..fde797b 100644
--- 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 401a860..21efbb5 100644
--- 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 ee090ae..36b8b56 100644
--- 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 bf8edcd..05252cd 100644
--- 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
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 7768818..24638348 100644
--- 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
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 5612fd5..35e19be 100644
--- 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
