mirror of git://gcc.gnu.org/git/gcc.git
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
This commit is contained in:
parent
401e4feab6
commit
5b1932a1b6
|
@ -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>
|
2010-12-21 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
PR target/46880
|
PR target/46880
|
||||||
|
|
|
@ -38,6 +38,7 @@ load_lib go-torture.exp
|
||||||
proc errchk { test } {
|
proc errchk { test } {
|
||||||
global dg-do-what-default
|
global dg-do-what-default
|
||||||
global DEFAULT_GOCFLAGS
|
global DEFAULT_GOCFLAGS
|
||||||
|
global runtests
|
||||||
|
|
||||||
set saved-dg-do-what-default ${dg-do-what-default}
|
set saved-dg-do-what-default ${dg-do-what-default}
|
||||||
set dg-do-what-default compile
|
set dg-do-what-default compile
|
||||||
|
@ -72,7 +73,12 @@ proc errchk { test } {
|
||||||
}
|
}
|
||||||
close $fdin
|
close $fdin
|
||||||
close $fdout
|
close $fdout
|
||||||
|
|
||||||
|
set hold_runtests $runtests
|
||||||
|
set runtests "go-test.exp"
|
||||||
go-dg-runtest $filename "-fno-show-column $DEFAULT_GOCFLAGS"
|
go-dg-runtest $filename "-fno-show-column $DEFAULT_GOCFLAGS"
|
||||||
|
set runtests $hold_runtests
|
||||||
|
|
||||||
file delete $filename
|
file delete $filename
|
||||||
set dg-do-what-default ${saved-dg-do-what-default}
|
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.
|
# This is an execution test which should fail.
|
||||||
proc go-execute-xfail { test } {
|
proc go-execute-xfail { test } {
|
||||||
global DEFAULT_GOCFLAGS
|
global DEFAULT_GOCFLAGS
|
||||||
|
global runtests
|
||||||
|
|
||||||
set filename [file tail $test]
|
set filename [file tail $test]
|
||||||
set fdin [open $test r]
|
set fdin [open $test r]
|
||||||
|
@ -90,7 +97,12 @@ proc go-execute-xfail { test } {
|
||||||
}
|
}
|
||||||
close $fdin
|
close $fdin
|
||||||
close $fdout
|
close $fdout
|
||||||
|
|
||||||
|
set hold_runtests $runtests
|
||||||
|
set runtests "go-test.exp"
|
||||||
go-dg-runtest $filename "-w $DEFAULT_GOCFLAGS"
|
go-dg-runtest $filename "-w $DEFAULT_GOCFLAGS"
|
||||||
|
set runtests $hold_runtests
|
||||||
|
|
||||||
file delete $filename
|
file delete $filename
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue