summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2009-08-21 15:43:23 -0700
committerIan Lance Taylor <iant@golang.org>2009-08-21 15:43:23 -0700
commit6d8f2e586a130314a6ad524a28fb7e7e4dc4861c (patch)
treecc792baef7db776dde30a58efd7e1b50036b871d
parentd6f16e030cb759270ee3b7df48751098f28453b3 (diff)
downloadgolang-6d8f2e586a130314a6ad524a28fb7e7e4dc4861c.tar.gz
Enable these tests. Fix divconst.go and modconst.go to
compile with the current compiler. Adjust expected error message in method1.go to match 6g output. R=rsc DELTA=9 (2 added, 5 deleted, 2 changed) OCL=33674 CL=33682
-rw-r--r--test/ken/divconst.go2
-rw-r--r--test/ken/modconst.go2
-rw-r--r--test/method1.go5
3 files changed, 2 insertions, 7 deletions
diff --git a/test/ken/divconst.go b/test/ken/divconst.go
index 5801975eb..29f1b067c 100644
--- a/test/ken/divconst.go
+++ b/test/ken/divconst.go
@@ -458,8 +458,6 @@ u8run()
}
}
-func xtest()
-
func
main()
{
diff --git a/test/ken/modconst.go b/test/ken/modconst.go
index ad720f448..7c35edeaa 100644
--- a/test/ken/modconst.go
+++ b/test/ken/modconst.go
@@ -458,8 +458,6 @@ u8run()
}
}
-func xtest()
-
func
main()
{
diff --git a/test/method1.go b/test/method1.go
index b6aacfea4..a562e3663 100644
--- a/test/method1.go
+++ b/test/method1.go
@@ -1,4 +1,4 @@
-// # errchk $G $D/$F.go
+// errchk $G $D/$F.go
// Copyright 2009 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
@@ -14,5 +14,4 @@ func f(int, string); // GCCGO_ERROR "previous"
func f(int, float) { } // ERROR "redeclared|redefinition"
func g(a int, b string); // GCCGO_ERROR "previous"
-func g(a int, c string); // ERROR "names changed"
-
+func g(a int, c string); // ERROR "redeclared|redefinition"