From: Ian Lance Taylor Date: Tue, 31 Aug 2010 21:12:23 +0000 (-0700) Subject: test: gccgo and gc print the error on different lines. X-Git-Tag: weekly.2010-09-06~40 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=09977734cd63aa31563cd11a3786e8951758b041;p=gostls13.git test: gccgo and gc print the error on different lines. This introduces GC_ERROR to mark an error only issued by the gc compiler. GCCGO_ERROR already exists to mark errors only issued by the gccgo compiler. Obviously these should be used sparingly. bug195.go:9: error: interface contains embedded non-interface bug195.go:12: error: interface contains embedded non-interface bug195.go:15: error: interface contains embedded non-interface bug195.go:18: error: invalid recursive interface bug195.go:22: error: invalid recursive interface R=rsc CC=golang-dev https://golang.org/cl/2040043 --- diff --git a/test/errchk b/test/errchk index 115aa7be09..ab7192da2a 100755 --- a/test/errchk +++ b/test/errchk @@ -60,8 +60,8 @@ sub bug() { $line = 0; foreach $src (@src) { $line++; - next unless $src =~ m|// ERROR (.*)|; - $regexp = $1; + next unless $src =~ m|// (GC_)?ERROR (.*)|; + $regexp = $2; if($regexp !~ /^"([^"]*)"/) { print STDERR "$file:$line: malformed regexp\n"; next; diff --git a/test/fixedbugs/bug195.go b/test/fixedbugs/bug195.go index 27bbbd354a..65ab02a039 100644 --- a/test/fixedbugs/bug195.go +++ b/test/fixedbugs/bug195.go @@ -19,9 +19,9 @@ type I4 interface { } type I5 interface { - I6 + I6 // GCCGO_ERROR "interface" } type I6 interface { - I5 // ERROR "interface" + I5 // GC_ERROR "interface" }