Update Go testsuite to release r60.

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / go.test / test / errchk

diff --git a/gcc/testsuite/go.test/test/errchk b/gcc/testsuite/go.test/test/errchk
index fbb021c..6b00570 100755 (executable)
--- a/gcc/testsuite/go.test/test/errchk
+++ b/gcc/testsuite/go.test/test/errchk
@@ -17,6 +17,13 @@
 
 use POSIX;
 
+my $exitcode = 1;
+
+if(@ARGV >= 1 && $ARGV[0] eq "-0") {
+       $exitcode = 0;
+       shift;
+}
+
 if(@ARGV < 1) {
        print STDERR "Usage: errchk COMPILER [OPTS] SOURCEFILES\n";
        exit 1;
@@ -47,12 +54,18 @@ $out = join('', <CMD>);
 
 close CMD;
 
-if($? == 0) {
+if($exitcode != 0 && $? == 0) {
        print STDERR "BUG: errchk: command succeeded unexpectedly\n";
        print STDERR @out;
        exit 0;
 }
 
+if($exitcode == 0 && $? != 0) {
+       print STDERR "BUG: errchk: command failed unexpectedly\n";
+       print STDERR @out;
+       exit 0;
+}
+
 if(!WIFEXITED($?)) {
        print STDERR "BUG: errchk: compiler crashed\n";
        print STDERR @out, "\n";
@@ -75,25 +88,46 @@ sub chk {
                $line++;
                next if $src =~ m|////|;  # double comment disables ERROR
                next unless $src =~ m|// (GC_)?ERROR (.*)|;
-               $regexp = $2;
-               if($regexp !~ /^"([^"]*)"/) {
+               my $all = $2;
+               if($all !~ /^"([^"]*)"/) {
                        print STDERR "$file:$line: malformed regexp\n";
                        next;
                }
-               $regexp = $1;
-
                @errmsg = grep { /$file:$line[:[]/ } @out;
                @out = grep { !/$file:$line[:[]/ } @out;
                if(@errmsg == 0) {
                        bug();
-                       print STDERR "errchk: $file:$line: missing expected error: '$regexp'\n";
+                       print STDERR "errchk: $file:$line: missing expected error: '$all'\n";
                        next;
                }
-               @match = grep { /$regexp/ } @errmsg;
-               if(@match == 0) {
+               foreach my $regexp ($all =~ /"([^"]*)"/g) {
+                       # Turn relative line number in message into absolute line number.
+                       if($regexp =~ /LINE(([+-])([0-9]+))?/) {
+                               my $n = $line;
+                               if(defined($1)) {
+                                       if($2 eq "+") {
+                                               $n += int($3);
+                                       } else {
+                                               $n -= int($3);
+                                       }
+                               }
+                               $regexp = "$`$file:$n$'";
+                       }
+       
+                       @match = grep { /$regexp/ } @errmsg;
+                       if(@match == 0) {
+                               bug();
+                               print STDERR "errchk: $file:$line: error messages do not match '$regexp'\n";
+                               next;
+                       }
+                       @errmsg = grep { !/$regexp/ } @errmsg;
+               }
+               if(@errmsg != 0) {
                        bug();
-                       print STDERR "errchk: $file:$line: error message does not match '$regexp'\n";
-                       next;
+                       print STDERR "errchk: $file:$line: unmatched error messages:\n";
+                       foreach my $l (@errmsg) {
+                               print STDERR "> $l";
+                       }
                }
        }
 }