* config/gdb-comm.exp: Remove unnecessary quotes.

	* config/gdb_stub.exp: Likewise.
	* config/vxworks.exp: Likewise.
	* config/unix.exp: Likewise.
	* config/sim.exp: Likewise.

6 files changed, 37 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index bcaa088..bed9e08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-12-09  Ben Elliston  <bje@gnu.org>
 
+	* config/gdb-comm.exp: Remove unnecessary quotes.
+	* config/gdb_stub.exp: Likewise.
+	* config/vxworks.exp: Likewise.
+	* config/unix.exp: Likewise.
+	* config/sim.exp: Likewise.
+
+2018-12-09  Ben Elliston  <bje@gnu.org>
+
 	* testsuite/lib/libsup.exp: Remove unnecessary quotes around
 	variable expansions.
 	* testsuite/lib/util-defs.exp: Likewise.
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index 141e4ee..776e012 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -293,17 +293,17 @@ proc gdb_comm_load { dest prog args } {
 		set bssoff $expect_out(1,string)
 		exp_continue
 	    }
-	    -re "$gdb_prompt" { }
+	    -re $gdb_prompt { }
 	}
 	set dataoff [format 0x%x [expr {$dataoff + $textoff}]]
 	set bssoff [format 0x%x [expr {$bssoff + $textoff}]]
 	remote_send host "sect .data $dataoff\n"
 	remote_expect host 10 {
-	    -re "$gdb_prompt" { }
+	    -re $gdb_prompt { }
 	}
 	remote_send host "sect .bss $bssoff\n"
 	remote_expect host 10 {
-	    -re "$gdb_prompt" { }
+	    -re $gdb_prompt { }
 	}
     }
 
@@ -559,7 +559,7 @@ proc gdb_comm_reload { dest prog aargs } {
 	incr try_again
 	set result [eval remote_load \"$dest\" \"$prog\" $aargs]
 	set try_again 0
-	return "$result"
+	return $result
     } else {
 	set try_again 0
 	return [list "untested" ""]
diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp
index d776b84..75ee8ee 100644
--- a/config/gdb_stub.exp
+++ b/config/gdb_stub.exp
@@ -58,13 +58,13 @@ proc gdb_stub_restart { dest } {
 	}
 	set spawn_id [remote_spawn host $command]
 	remote_expect host 30 {
-	    -re "$gdb_prompt" { }
+	    -re $gdb_prompt { }
 	}
 	if { $spawn_id >= 0 } {
 	    if {[board_info $dest exists baud]} {
 		remote_send host "set remotebaud [board_info $dest baud]\n"
 		remote_expect host 5 {
-		    -re "$gdb_prompt" { }
+		    -re $gdb_prompt { }
 		    default {
 			warning "Error setting baud rate."
 			return -1
@@ -112,13 +112,13 @@ proc gdb_stub_remote_check { dest } {
 	    verbose "stub is already running"
 	    return 1
 	}
-	-re "$gdb_prompt" {
+	-re $gdb_prompt {
 	    return 0
 	}
 	timeout {
 	    remote_send host "\003"
 	    remote_expect host 10 {
-		-re "$gdb_prompt" { }
+		-re $gdb_prompt { }
 	    }
 	    return 0
 	}
@@ -166,9 +166,9 @@ proc gdb_stub_startup { dest } {
 	set loader "loader"
 	if {![file exists $loader]} {
 	    if {[board_info $dest exists gdb_stub_offset]} {
-		set result [target_compile "${libdir}/stub-loader.c" $loader executable "libs=-Wl,-Ttext,[board_info $dest gdb_stub_offset]"]
+		set result [target_compile $libdir/stub-loader.c $loader executable "libs=-Wl,-Ttext,[board_info $dest gdb_stub_offset]"]
 	    } else {
-		set result [target_compile "${libdir}/stub-loader.c" $loader executable "ldscript=[board_info $dest gdb_stub_ldscript]"]
+		set result [target_compile $libdir/stub-loader.c $loader executable "ldscript=[board_info $dest gdb_stub_ldscript]"]
 	    }
 	    verbose "result is $result"
 	    if {[isremote host]} {
@@ -202,7 +202,7 @@ proc gdb_stub_startup { dest } {
 	remote_expect host 60 {
 	    -re "appears to be alive.*$gdb_prompt" { }
 	    -re "Remote target.*connected to.*$gdb_prompt" { }
-	    -re "$gdb_prompt" {
+	    -re $gdb_prompt {
 		warning "Error reconnecting to stub."
 		return -1
 	    }
@@ -358,7 +358,7 @@ proc gdb_stub_start { dest } {
 
     remote_send host "set \$fp=0\n"
     remote_expect host 10 {
-	-re "$gdb_prompt" { }
+	-re $gdb_prompt { }
     }
     # This is needed for the SparcLite. Whee.
     if {[board_info $dest exists gdb,start_symbol]} {
@@ -543,11 +543,11 @@ proc gdb_stub_ld { dest prog } {
 	-re "$gdb_prompt $" {
 	    # Hmmm...is retrying going to help? I kinda doubt it.
 	    warning "GDB couldn't read file"
-	    return [gdb_stub_retry_ld "$dest" "$prog"]
+	    return [gdb_stub_retry_ld $dest $prog]
 	}
 	timeout {
 	    warning "(timeout) read symbol file"
-	    return [gdb_stub_retry_ld "$dest" "$prog"]
+	    return [gdb_stub_retry_ld $dest $prog]
 	}
     }
 
diff --git a/config/sim.exp b/config/sim.exp
index 2a66731..f6c5852 100644
--- a/config/sim.exp
+++ b/config/sim.exp
@@ -95,7 +95,7 @@ proc sim_load { dest prog args } {
     if { $inpfile ne "" } {
 	set res [remote_spawn target "${cmd} < $inpfile" "readonly"]
     } else {
-	set res [remote_spawn target "${cmd}"]
+	set res [remote_spawn target $cmd]
     }
 
     if { $res <= 0 } {
diff --git a/config/unix.exp b/config/unix.exp
index 0b8e124..30e5d87 100644
--- a/config/unix.exp
+++ b/config/unix.exp
@@ -62,7 +62,7 @@ proc unix_load { dest prog args } {
     }
     verbose "loading to $dest" 2
     if {![isremote $dest]} {
-	if { "$inp" ne "" } {
+	if { $inp ne "" } {
 	    set command "$prog $parg < $inp"
 	} else {
 	    set command "$prog $parg"
@@ -73,12 +73,12 @@ proc unix_load { dest prog args } {
 	}
 
 	set orig_ld_library_path "[getenv LD_LIBRARY_PATH]"
-	setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path"
-	setenv SHLIB_PATH "$ld_library_path:$orig_ld_library_path"
+	setenv LD_LIBRARY_PATH $ld_library_path:$orig_ld_library_path
+	setenv SHLIB_PATH $ld_library_path:$orig_ld_library_path
 	verbose -log "Setting LD_LIBRARY_PATH to $ld_library_path:$orig_ld_library_path" 2
 	verbose -log "Execution timeout is: $test_timeout" 2
 
-	set id [remote_spawn $dest "$command" "readonly"]
+	set id [remote_spawn $dest $command "readonly"]
 	if { $id < 0 } {
 	    set output "remote_spawn failed"
 	    set status -1
@@ -119,7 +119,7 @@ proc unix_load { dest prog args } {
 		return [list "unresolved" ""]
 	    }
 	}
-	set status [remote_exec $dest "$remotefile" $parg $inp]
+	set status [remote_exec $dest $remotefile $parg $inp]
 	remote_file $dest delete $remotefile.o $remotefile
 	if { [lindex $status 0] < 0 } {
 	    verbose -log "Couldn't execute $prog, [lindex $status 1]" 3
@@ -134,7 +134,7 @@ proc unix_load { dest prog args } {
 
     verbose "Executed $prog, status $status" 2
     if {$output ne ""} {
-	verbose -- "$output" 2
+	verbose -- $output 2
     }
     if { $status == 0 } {
 	set result "pass"
diff --git a/config/vxworks.exp b/config/vxworks.exp
index 0a65de8..e6ce9df 100644
--- a/config/vxworks.exp
+++ b/config/vxworks.exp
@@ -39,7 +39,7 @@ proc ${board}_init { dest } {
     remote_raw_open $dest raw
     remote_send $dest "\n"
     remote_expect $dest 5 {
-	-re "$shell_prompt" {
+	-re $shell_prompt {
 	    set do_reboot 1
 	}
 	-re "Press any key to stop auto-boot" {
@@ -76,7 +76,7 @@ proc ${board}_init { dest } {
 	    set curr_file $expect_out(1,string)
 	    exp_continue
 	}
-	-re "$boot_mon_prompt" { }
+	-re $boot_mon_prompt { }
     }
     if {![info exists curr_file]} {
 	remote_close $dest
@@ -96,7 +96,7 @@ proc ${board}_init { dest } {
 		remote_send $dest "\n"
 		exp_continue
 	    }
-	    -re "$boot_mon_prompt" {}
+	    -re $boot_mon_prompt {}
 	}
     }
     remote_send $dest "@\n"
@@ -201,7 +201,7 @@ proc vxworks_send { dest string } {
     # Convert LFs to CRs, 'cause that is what VxWorks wants to see.
     regsub -all "\n" $string "\r" string
     verbose "Sending '$string' to $dest" 2
-    return [remote_raw_send $dest "$string"]
+    return [remote_raw_send $dest $string]
 }
 
 proc vxworks_open { dest args } {
@@ -340,7 +340,7 @@ proc vxworks_ld { dest prog } {
     }
 
     if { $result && [info exists expect_out(buffer)] } {
-	send_log "$expect_out(buffer)"
+	send_log $expect_out(buffer)
     }
 
     remote_file $dest delete $prog
@@ -387,8 +387,8 @@ proc vxworks_run { dest function pargs inp outp } {
 	    set result -1
 	}
 	-re "(.*)\\*\\*\\* EXIT code ($decimal)\[\r\n\]" {
-	    set output "$expect_out(1,string)"
-	    set exit_code "$expect_out(2,string)"
+	    set output $expect_out(1,string)
+	    set exit_code $expect_out(2,string)
 	    if { ($exit_code + 0) != 0 } {
 		set result 1
 	    } else {
@@ -409,7 +409,7 @@ proc vxworks_run { dest function pargs inp outp } {
 	}
 	timeout {
 	    # Infinite loop? probably.
-	    remote_exec $dest "td" "$tid"
+	    remote_exec $dest "td" $tid
 	    set result 1
 	}
     }