summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2010-09-15 17:00:00 -0700
committerRobert Griesemer <gri@golang.org>2010-09-15 17:00:00 -0700
commitbf6e8fd33032d8f6efb1efc7766180b90a83b00d (patch)
tree08c8c12cfc34f16cdb5f4914e9972bae14d46d1b
parent3e2f048688ad8f8947b086f09322bb137e9bd86d (diff)
downloadgo-bf6e8fd33032d8f6efb1efc7766180b90a83b00d.tar.gz
fix build
R=iant CC=golang-dev, ken2 http://codereview.appspot.com/2182043
-rwxr-xr-xtest/errchk4
-rw-r--r--test/fixedbugs/bug305.go (renamed from test/bugs/bug305.go)2
-rw-r--r--test/golden.out8
3 files changed, 3 insertions, 11 deletions
diff --git a/test/errchk b/test/errchk
index ab7192da2..d65899be6 100755
--- a/test/errchk
+++ b/test/errchk
@@ -68,8 +68,8 @@ foreach $src (@src) {
}
$regexp = $1;
- @errmsg = grep { /$file:$line:/ } @out;
- @out = grep { !/$file:$line:/ } @out;
+ @errmsg = grep { /$file:$line[:[]/ } @out;
+ @out = grep { !/$file:$line[:[]/ } @out;
if(@errmsg == 0) {
bug();
print STDERR "errchk: $file:$line: missing expected error: '$regexp'\n";
diff --git a/test/bugs/bug305.go b/test/fixedbugs/bug305.go
index 1369d560e..758fee269 100644
--- a/test/bugs/bug305.go
+++ b/test/fixedbugs/bug305.go
@@ -5,7 +5,7 @@
// license that can be found in the LICENSE file.
// Use //line to set the line number of the next line to 20.
-//line bug305.go:20
+//line fixedbugs/bug305.go:20
package p
diff --git a/test/golden.out b/test/golden.out
index eb1f2320a..49bca4b87 100644
--- a/test/golden.out
+++ b/test/golden.out
@@ -177,11 +177,3 @@ panic PC=xxx
=========== bugs/bug260.go
FAIL
BUG: bug260 failed
-
-=========== bugs/bug305.go
-BUG: errchk: bugs/bug305.go:24: missing expected error: 'cannot|incompatible'
-errchk: bugs/bug305.go: unmatched error messages:
-==================================================
-bug305.go:23[bugs/bug305.go:12]: cannot convert "bogus" to type int
-bug305.go:23[bugs/bug305.go:12]: cannot use "bogus" (type string) as type int in assignment
-==================================================