* runtest.exp: Use switch, not case.

	* lib/framework.exp (clone_output): Likewise.
	(clear_xfail): Likewise.
	(clear_kfail): Likewise.
	(set_warning_threshold): Make warning_threshold global.
	(get_warning_threshold): Likewise.
	* lib/libgloss.exp (process_multilib_options): Use switch, not
	case.
	* lib/remote.exp (local_exec): Only run global errorInfo once.
	(standard_upload): Fix error in variable use ($file -> $srcfile).
	* lib/utils.exp (grep): Use switch, not case.
	(slay): Fix mismatched bracket.

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/remote.exp b/lib/remote.exp
index f41919c..b493791 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -86,7 +86,8 @@ proc local_exec { commandline inp outp timeout } {
     # doesn't assign process groups correctly and we can't reliably kill
     # programs that bear children. We can't use tcl's exec because it has
     # no way to timeout programs that hang. *sigh*
-    #
+
+    global errorInfo
     if { "$inp" == "" && "$outp" == "" } {
 	set id -1
 	set result [catch "eval spawn \{${commandline}\}" pid]
@@ -126,7 +127,6 @@ proc local_exec { commandline inp outp timeout } {
 	}
 
 	if { $result != 0 } {
-	    global errorInfo
 	    return [list -1 "open of $commandline $inp $outp failed: $errorInfo"]
 	}
 	set pid [pid $id]
@@ -138,7 +138,6 @@ proc local_exec { commandline inp outp timeout } {
     verbose "pid is $pid $pgid"
     if { $result != 0 || $result2 != 0 } {
 	# This shouldn't happen.
-	global errorInfo
 	if [info exists errorInfo] {
 	    set foo $errorInfo
 	} else {
@@ -485,7 +484,7 @@ proc standard_upload { dest srcfile destfile } {
 	catch {exec chmod u+rw $destfile}
     }
     if { $result != 0 || $output != "" } {
-	perror "remote_upload to $dest of $file to $destfile: $output"
+	perror "remote_upload to $dest of $srcfile to $destfile: $output"
 	return ""
     } else {
 	return $destfile