From d9953c9ddea6467f6cd3c59ccc34546cfc0f42c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Oudompheng?= Date: Sun, 7 Oct 2012 18:37:05 +0200 Subject: [PATCH] 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 --- test/fixedbugs/bug083.go | 7 ++-- test/fixedbugs/bug133.go | 7 ++-- test/fixedbugs/bug160.go | 7 ++-- test/fixedbugs/bug322.go | 7 ++-- .../fixedbugs/bug324.dir/{main.go => prog.go} | 0 test/fixedbugs/bug324.go | 11 +++--- .../fixedbugs/bug367.dir/{main.go => prog.go} | 0 test/fixedbugs/bug367.go | 8 ++--- test/fixedbugs/bug414.dir/main.go | 18 ---------- test/fixedbugs/bug414.dir/p1.go | 34 +++++++++---------- test/fixedbugs/bug414.dir/prog.go | 18 ++++++++++ test/fixedbugs/bug414.go | 7 ++-- test/run.go | 15 +++----- 13 files changed, 59 insertions(+), 80 deletions(-) rename test/fixedbugs/bug324.dir/{main.go => prog.go} (100%) rename test/fixedbugs/bug367.dir/{main.go => prog.go} (100%) delete mode 100644 test/fixedbugs/bug414.dir/main.go create mode 100644 test/fixedbugs/bug414.dir/prog.go diff --git a/test/fixedbugs/bug083.go b/test/fixedbugs/bug083.go index 8bdecaadb51..54a17423a08 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 a6baac26ca3..54a17423a08 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 c5e166a0cf9..fde797bfcd2 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 401a8600a9e..21efbb55935 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 ee090ae42f4..36b8b56d123 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 bf8edcd1b85..05252cd9a6d 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 52001233c62..00000000000 --- 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 7768818bf9f..24638348433 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 00000000000..f55d9469689 --- /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 5612fd5c233..35e19be38e2 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 diff --git a/test/run.go b/test/run.go index 49bcd96c94c..c22bfb2ec39 100644 --- 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,