From e2fb9266669c87021ce666f8dca81ab2d96635d1 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sun, 9 Dec 2018 18:41:26 +1100 Subject: * baseboards/basic-sid.exp, baseboards/basic-sim.exp, baseboards/i386-sid.exp, baseboards/mt-sid.exp, baseboards/sh-sid.exp, config/adb.exp, config/gdb-comm.exp, config/gdb_stub.exp, config/sim.exp, config/unix.exp, config/vxworks.exp, lib/dejagnu.exp, lib/dg.exp, lib/framework.exp, lib/kermit.exp, lib/libgloss.exp, lib/remote.exp, lib/rsh.exp, lib/target.exp, lib/tip.exp, lib/utils.exp, testsuite/lib/libsup.exp, testsuite/runtest.all/options.exp,: Remove unnecessary braces around variable expansions. --- config/adb.exp | 4 ++-- config/gdb-comm.exp | 2 +- config/gdb_stub.exp | 4 ++-- config/sim.exp | 2 +- config/unix.exp | 2 +- config/vxworks.exp | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'config') diff --git a/config/adb.exp b/config/adb.exp index 87d3d1a..fb6b3d7 100644 --- a/config/adb.exp +++ b/config/adb.exp @@ -43,8 +43,8 @@ proc adb_open { hostname } { set tries 0 set result -1 - if {[board_info ${hostname} exists shell_prompt]} { - set shell_prompt [board_info ${hostname} shell_prompt] + if {[board_info $hostname exists shell_prompt]} { + set shell_prompt [board_info $hostname shell_prompt] } else { set shell_prompt "root@android:/ # " } diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp index 776e012..c9ef574 100644 --- a/config/gdb-comm.exp +++ b/config/gdb-comm.exp @@ -164,7 +164,7 @@ proc gdb_comm_start { dest } { # Similarly for GDB. Look in the object directory for gdb if we aren't # provided with one. if {![info exists GDB]} then { - set GDB "[lookfor_file ${tool_root_dir} gdb/gdb]" + set GDB "[lookfor_file $tool_root_dir gdb/gdb]" if { $GDB eq "" } { set GDB [transform gdb] } diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp index 75ee8ee..b0bf61c 100644 --- a/config/gdb_stub.exp +++ b/config/gdb_stub.exp @@ -28,7 +28,7 @@ proc gdb_stub_init { dest args } { global tool_root_dir if {![info exists GDB]} then { - set GDB "[lookfor_file ${tool_root_dir} gdb/gdb]" + set GDB "[lookfor_file $tool_root_dir gdb/gdb]" if { $GDB eq "" } { set GDB [transform gdb] } @@ -82,7 +82,7 @@ proc gdb_stub_restart { dest } { } remote_reboot $dest } - if { ${x} < 4 } { + if { $x < 4 } { global board_info set name [board_info $dest name] diff --git a/config/sim.exp b/config/sim.exp index f6c5852..520a2c0 100644 --- a/config/sim.exp +++ b/config/sim.exp @@ -93,7 +93,7 @@ proc sim_load { dest prog args } { # this isn't as nice as limiting the amount of CPU time, it # will have to do. if { $inpfile ne "" } { - set res [remote_spawn target "${cmd} < $inpfile" "readonly"] + set res [remote_spawn target "$cmd < $inpfile" "readonly"] } else { set res [remote_spawn target $cmd] } diff --git a/config/unix.exp b/config/unix.exp index 30e5d87..2e38454 100644 --- a/config/unix.exp +++ b/config/unix.exp @@ -114,7 +114,7 @@ proc unix_load { dest prog args } { # rcp's to lynx seem not to get marked executable set status [remote_exec $dest "chmod +x $remotefile"] if { [lindex $status 0] != 0 } { - remote_file $dest delete ${remotefile}.o $remotefile + remote_file $dest delete $remotefile.o $remotefile verbose -log "chmod +x of $prog on $dest failed." 3 return [list "unresolved" ""] } diff --git a/config/vxworks.exp b/config/vxworks.exp index e6ce9df..abf999d 100644 --- a/config/vxworks.exp +++ b/config/vxworks.exp @@ -138,7 +138,7 @@ proc vxworks_exec { dest program pargs inp outp } { } set shell_prompt [board_info $dest shell_prompt] - remote_send $dest "${program} ${pargs}$suffix\n" + remote_send $dest "$program $pargs$suffix\n" # FIXME: The value 300 below should probably be a parameter passed in. remote_expect $dest 300 { -re "\\\[VxWorks Boot\\\]:" { @@ -180,12 +180,12 @@ proc vxworks_file { dest op args } { set dir "[board_info $dest vxworks_homedir]" switch -- $op { exists { - set file "${dir}/[file tail $file]" + set file "$dir/[file tail $file]" return [file exists $file] } delete { foreach x $args { - set x "${dir}/[file tail $x]" + set x "$dir/[file tail $x]" if { [file exists $x] && [file isfile $x] } { file delete -force -- $x } @@ -324,7 +324,7 @@ proc vxworks_ld { dest prog } { perror "Can't access $prog." set result 1 } - -re "value = (-*${decimal}) = ${hex}.*$shell_prompt $" { + -re "value = (-*$decimal) = $hex.*$shell_prompt $" { verbose "Loaded $prog into vxworks." set board_info([board_info $dest name],vx_module) $expect_out(1,string) set result 0 @@ -377,7 +377,7 @@ proc vxworks_run { dest function pargs inp outp } { set result 1 # FIXME: The value 300 below should be a parameter. remote_expect $dest 300 { - -re "task ${hex} - aborted.*$shell_prompt $" { + -re "task $hex - aborted.*$shell_prompt $" { # FIXME: It's not clear we'll ever get here. verbose "$function aborted" set result 1 -- cgit v1.1