From 83e45168bfb7ff84541f118196d583c86344f3f2 Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 21 Dec 2010 22:42:14 +0000
Subject: [PATCH] 	* go.test/go-test.exp: Clear runtests around
 invocation of 	go-dg-runtest from errchk and go-execute-xfail.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168136 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog           |  9 +++++++--
 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 ea27d4ac4f0..1158e49f59c 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 6226dd1c925..d60096dd867 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
 }
 
-- 
2.11.0