diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-21 22:42:14 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-21 22:42:14 +0000 |
| commit | 5b1932a1b63fc243564ec8242998d1940e95c0c6 (patch) | |
| tree | 58215c8fd5603e4a6d67b9752489c9d284a21dad /gcc | |
| parent | 401e4feab6365059d6bfdbbced6a6effb7cf69ee (diff) | |
| download | gcc-5b1932a1b63fc243564ec8242998d1940e95c0c6.zip gcc-5b1932a1b63fc243564ec8242998d1940e95c0c6.tar.gz gcc-5b1932a1b63fc243564ec8242998d1940e95c0c6.tar.bz2 | |
go-test.exp: Clear runtests around invocation of go-dg-runtest from errchk and go-execute-xfail.
* go.test/go-test.exp: Clear runtests around invocation of
go-dg-runtest from errchk and go-execute-xfail.
From-SVN: r168136
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/testsuite/go.test/go-test.exp | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea27d4a..1158e49 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-21 Ian Lance Taylor <iant@google.com> + + * go.test/go-test.exp: Clear runtests around invocation of + go-dg-runtest from errchk and go-execute-xfail. + 2010-12-21 Jakub Jelinek <jakub@redhat.com> PR target/46880 @@ -14,8 +19,8 @@ * objc.dg/special/special.exp: Added new test. * objc.dg/special/load-category-1.m: New. * objc.dg/special/load-category-1a.m: New. - * objc.dg/special/load-category-1.h: New. - + * objc.dg/special/load-category-1.h: New. + 2010-12-21 Steven Bosscher <steven@gcc.gnu.org> PR middle-end/45310 diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp index 6226dd1..d60096d 100644 --- a/gcc/testsuite/go.test/go-test.exp +++ b/gcc/testsuite/go.test/go-test.exp @@ -38,6 +38,7 @@ load_lib go-torture.exp proc errchk { test } { global dg-do-what-default global DEFAULT_GOCFLAGS + global runtests set saved-dg-do-what-default ${dg-do-what-default} set dg-do-what-default compile @@ -72,7 +73,12 @@ proc errchk { test } { } close $fdin close $fdout + + set hold_runtests $runtests + set runtests "go-test.exp" go-dg-runtest $filename "-fno-show-column $DEFAULT_GOCFLAGS" + set runtests $hold_runtests + file delete $filename set dg-do-what-default ${saved-dg-do-what-default} } @@ -80,6 +86,7 @@ proc errchk { test } { # This is an execution test which should fail. proc go-execute-xfail { test } { global DEFAULT_GOCFLAGS + global runtests set filename [file tail $test] set fdin [open $test r] @@ -90,7 +97,12 @@ proc go-execute-xfail { test } { } close $fdin close $fdout + + set hold_runtests $runtests + set runtests "go-test.exp" go-dg-runtest $filename "-w $DEFAULT_GOCFLAGS" + set runtests $hold_runtests + file delete $filename } |