diff options
| author | Ian Lance Taylor <iant@google.com> | 2014-07-20 15:21:57 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-07-20 15:21:57 +0000 |
| commit | 9b0834f68353d52e4d5000a599e5169b79c0c343 (patch) | |
| tree | d689d9567a43444fc58a07d00e9b09a5f7a1f875 | |
| parent | 16c6dcc57b81334bdfc99b994686f42369e33094 (diff) | |
| download | gcc-9b0834f68353d52e4d5000a599e5169b79c0c343.zip gcc-9b0834f68353d52e4d5000a599e5169b79c0c343.tar.gz gcc-9b0834f68353d52e4d5000a599e5169b79c0c343.tar.bz2 | |
go-test.exp (go-gc-tests): Support multiple files in one package for compiledir tests.
* go.test/go-test.exp (go-gc-tests): Support multiple files in one
package for compiledir tests.
From-SVN: r212872
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/go.test/go-test.exp | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19d3bd6..3777264 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-07-20 Ian Lance Taylor <iant@google.com> + + * go.test/go-test.exp (go-gc-tests): Support multiple files in one + package for compiledir tests. + 2014-07-20 Marek Polacek <polacek@redhat.com> PR c/61852 diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp index 04fabdb..eed0d68 100644 --- a/gcc/testsuite/go.test/go-test.exp +++ b/gcc/testsuite/go.test/go-test.exp @@ -651,13 +651,17 @@ proc go-gc-tests { } { set runtests "go-test.exp" set dg-do-what-default "assemble" set dir "[file rootname $test].dir" - set del {} - foreach f [lsort [glob "$dir/*.go"]] { - dg-test -keep-output $f "-O" "-w $DEFAULT_GOCFLAGS" - lappend del "[file rootname [file tail $f]].o" - } - foreach f $del { - file delete $f + set files [lsort [glob "$dir/*.go"]] + set packages [go-find-packages $test $name $files] + if { [llength $packages] > 0 } { + set del [list] + foreach p $packages { + dg-test -keep-output [lindex $p 1] "[lrange $p 2 end] -O" "-w $DEFAULT_GOCFLAGS" + lappend del "[file rootname [file tail [lindex $p 1]]].o" + } + foreach f $del { + file delete $f + } } set runtests $hold_runtests } elseif { $test_line == "// rundir" } { |