* config/gdb-comm.exp (gdb_comm_load): Brace some expressions.

	* config/i960.exp (i960_spawn): Initialise status.
	* config/netware.exp (${board}_init): Brace some if expressions.
	* lib/dg.exp (dg-test): Brace some expressions.
	* lib/framework.exp (clone_output, log_and_exit, log_summary,
	record_test, pass, fail): Likewise.
	* lib/libgloss.exp (get_multilibs): Likewise.
	* lib/remote.exp (standard_transmit, unix_clean_filename,
	remote_load, check_for_board_status, remote_expect): Likewise.
	* lib/rsh.exp (rsh_exec): Likewise.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/dg.exp b/lib/dg.exp
index b91a23e..840c2d8 100644
--- a/lib/dg.exp
+++ b/lib/dg.exp
@@ -634,8 +634,8 @@ proc dg-test { args } {
 	return
     }
     set prog [lindex $args $i]
-    set tool_flags [lindex $args [expr $i + 1]]
-    set default_extra_tool_flags [lindex $args [expr $i + 2]]
+    set tool_flags [lindex $args [expr {$i + 1}]]
+    set default_extra_tool_flags [lindex $args [expr {$i + 2}]]
 
     set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]*"
 
@@ -811,7 +811,7 @@ proc dg-test { args } {
     # FIXME: why?
     if { ${dg-interpreter-batch-mode} == 0 } {
 	# Catch excess errors (new bugs or incomplete testcases).
-	if ${dg-excess-errors-flag} {
+	if {${dg-excess-errors-flag}} {
 	    setup_xfail "*-*-*"
 	}
 	if {![string match "" $comp_output]} {