re PR go/50656 (Several Go tests with unrecognized test line)

	PR go/50656
	* go.test/go-test.exp (go-gc-tests): Recognize some more test
	lines.

From-SVN: r183270

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8507039f46faa92a3b359c2a4883fd9de5920b8e..352f15d99fd153f91f3e137dab8eedbc5cf8a109 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-17  Ian Lance Taylor  <iant@google.com>
+
+       PR go/50656
+       * go.test/go-test.exp (go-gc-tests): Recognize some more test
+       lines.
+
 2012-01-17  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/51869

diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 10cd151ab9340968389e36823a47f7f8c69d469c..01be094b7d4e704a105a7539bfcd38b9a1694206 100644 (file)
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 #   Written by Ian Lance Taylor <iant@google.com>.
 
 # This program is free software; you can redistribute it and/or modify
@@ -467,6 +467,9 @@ proc go-gc-tests { } {
                               $test_line] \
                       || [string match \
                               "// \$G \$D/\$F.dir/b.go && \$G \$D/\$F.dir/a.go" \
+                              $test_line] \
+                      || [string match \
+                              "// \$G \$D/\$F.dir/io.go && errchk \$G -e \$D/\$F.dir/main.go" \
                               $test_line] } {
            if { [string match \
                      "// \$G \$D/\$F.dir/bug0.go && errchk \$G \$D/\$F.dir/bug1.go" \
@@ -474,13 +477,20 @@ proc go-gc-tests { } {
                set name1 "bug0.go"
                set name2 "bug1.go"
            } elseif { [string match \
-                     "// \$G \$D/\$F.dir/p1.go && \$G \$D/\$F.dir/p2.go" \
-                     $test_line] } {
+                           "// \$G \$D/\$F.dir/p1.go && \$G \$D/\$F.dir/p2.go" \
+                           $test_line] } {
                set name1 "p1.go"
                set name2 "p2.go"
-           } else {
+           } elseif { [string match \
+                           "// \$G \$D/\$F.dir/b.go && \$G \$D/\$F.dir/a.go" \
+                           $test_line] } {
                set name1 "b.go"
                set name2 "a.go"
+           } elseif { [string match \
+                           "// \$G \$D/\$F.dir/io.go && errchk \$G -e \$D/\$F.dir/main.go" \
+                           $test_line] } {
+               set name1 "io.go"
+               set name2 "main.go"
            }
            set hold_runtests $runtests
            set runtests "go-test.exp"
@@ -491,6 +501,17 @@ proc go-gc-tests { } {
            errchk $file2 ""
            file delete "[file rootname [file tail $file1]].o"
            set runtests $hold_runtests
+       } elseif { [string match \
+                       "// \$G \$D/\${F}1.go && errchk \$G \$D/\$F.go" \
+                       $test_line ] } {
+           set hold_runtests $runtests
+           set runtests "go-test.exp"
+           set dg-do-what-default "assemble"
+           regsub "\\.go$" $test "1.go" file1
+           dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
+           errchk $test ""
+           file delete "[file rootname [file tail $file1]].o"
+           set runtests $hold_runtests
        } elseif { [string match \
                        "// \$G \$D/\$F.dir/bug0.go && (! \$G \$D/\$F.dir/bug1.go || echo BUG*" \
                        $test_line] } {
@@ -537,14 +558,28 @@ proc go-gc-tests { } {
            set runtests $hold_runtests
        } elseif { [string match \
                        "// \$G \$D/bug160.dir/x.go && \$G \$D/bug160.dir/y.go && \$L y.\$A && ./\$A.out" \
-                       $test_line] } {
+                       $test_line] \
+                      || [string match \
+                              "// \$G \$D/\$F.dir/p.go && \$G \$D/\$F.dir/main.go && \$L main.\$A && ./\$A.out" \
+                              $test_line] } {
+           if { [string match \
+                       "// \$G \$D/bug160.dir/x.go && \$G \$D/bug160.dir/y.go && \$L y.\$A && ./\$A.out" \
+                     $test_line] } {
+               set name1 "x.go"
+               set name2 "y.go"
+           } elseif { [string match \
+                          "// \$G \$D/\$F.dir/p.go && \$G \$D/\$F.dir/main.go && \$L main.\$A && ./\$A.out" \
+                           $test_line] } {
+               set name1 "p.go"
+               set name2 "main.go"
+           }
            set hold_runtests $runtests
            set runtests "go-test.exp"
            set dg-do-what-default "assemble"
-           regsub "\\.go$" $test ".dir/x.go" file1
+           regsub "\\.go$" $test ".dir/$name1" file1
            dg-test -keep-output $file1 "-O" "-w $DEFAULT_GOCFLAGS"
            set ofile1 "[file rootname [file tail $file1]].o"
-           regsub "\\.go$" $test ".dir/y.go" file2
+           regsub "\\.go$" $test ".dir/$name2" file2
            dg-test -keep-output $file2 "-O" "-w $DEFAULT_GOCFLAGS"
            set ofile2 "[file rootname [file tail $file2]].o"
            set dg-do-what-default "link"

diff --git a/gcc/testsuite/go.test/test/fixedbugs/bug345.dir/main.go b/gcc/testsuite/go.test/test/fixedbugs/bug345.dir/main.go
index 5bdc713f4e0b0e12c5e0b7b644502d7900b858f4..ddba8dad40ade8d4404d91fda3d8fce3f4faba97 100644 (file)
--- a/gcc/testsuite/go.test/test/fixedbugs/bug345.dir/main.go
+++ b/gcc/testsuite/go.test/test/fixedbugs/bug345.dir/main.go
@@ -22,7 +22,7 @@ func main() {
        // main.go:27: cannot use &x (type *"io".SectionReader) as type *"/Users/rsc/g/go/test/fixedbugs/bug345.dir/io".SectionReader in function argument
 
        var w io.Writer
-       bufio.NewWriter(w)  // ERROR "test/io"
+       bufio.NewWriter(w)  // ERROR "test/io|has incompatible type"
        var x goio.SectionReader
-       io.SR(&x)  // ERROR "test/io"
+       io.SR(&x)  // ERROR "test/io|has incompatible type"
 }

diff --git a/gcc/testsuite/go.test/test/fixedbugs/bug364.go b/gcc/testsuite/go.test/test/fixedbugs/bug364.go
index a17453419417734b7a911449ed16bd99da52b183..a93312107e336515efde1fdbf20042d86edaef9e 100644 (file)
--- a/gcc/testsuite/go.test/test/fixedbugs/bug364.go
+++ b/gcc/testsuite/go.test/test/fixedbugs/bug364.go
@@ -1,3 +1,9 @@
+// $G $D/$F.go && $L $F.$A && ./$A.out
+
+// 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.
+
 package main
 
 import "fmt"