diff options
author | Ben Elliston <bje@gnu.org> | 2018-12-09 16:38:56 +1100 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2018-12-09 16:38:56 +1100 |
commit | d5f3788c0634ca5a42419d9d2e153e1887d34cf2 (patch) | |
tree | e4f9324e0666ec104333d956ea166f233260ef07 | |
parent | c3fe064d1b583e518784da765200838390893211 (diff) | |
download | dejagnu-d5f3788c0634ca5a42419d9d2e153e1887d34cf2.zip dejagnu-d5f3788c0634ca5a42419d9d2e153e1887d34cf2.tar.gz dejagnu-d5f3788c0634ca5a42419d9d2e153e1887d34cf2.tar.bz2 |
* baseboards/androideabi.exp: Remove unnecessary quotes and braces
around variable expansions.
* baseboards/basic-sid.exp: Likewise.
* baseboards/cris-sim.exp: Likewise.
* baseboards/generic-sim.exp: Likewise.
* baseboards/mcore-moto-sim.exp: Likewise.
* baseboards/multi-sim.exp: Likewise.
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | baseboards/androideabi.exp | 2 | ||||
-rw-r--r-- | baseboards/basic-sid.exp | 4 | ||||
-rw-r--r-- | baseboards/cris-sim.exp | 4 | ||||
-rw-r--r-- | baseboards/generic-sim.exp | 8 | ||||
-rw-r--r-- | baseboards/mcore-moto-sim.exp | 2 | ||||
-rw-r--r-- | baseboards/multi-sim.exp | 16 |
7 files changed, 28 insertions, 18 deletions
@@ -1,3 +1,13 @@ +2018-12-09 Ben Elliston <bje@gnu.org> + + * baseboards/androideabi.exp: Remove unnecessary quotes and braces + around variable expansions. + * baseboards/basic-sid.exp: Likewise. + * baseboards/cris-sim.exp: Likewise. + * baseboards/generic-sim.exp: Likewise. + * baseboards/mcore-moto-sim.exp: Likewise. + * baseboards/multi-sim.exp: Likewise. + 2018-12-08 Ben Elliston <bje@gnu.org> * NEWS: Tweak. diff --git a/baseboards/androideabi.exp b/baseboards/androideabi.exp index f6dda2a..2a08bb8 100644 --- a/baseboards/androideabi.exp +++ b/baseboards/androideabi.exp @@ -102,7 +102,7 @@ proc adb_load { dest prog args } { verbose -log "Executed $prog, status $status" 2 if {$output ne ""} { - verbose -log -- "$output" 2 + verbose -log -- $output 2 } if { $status == 0 } { return [list "pass" $output] diff --git a/baseboards/basic-sid.exp b/baseboards/basic-sid.exp index d03bfed..31e4d82 100644 --- a/baseboards/basic-sid.exp +++ b/baseboards/basic-sid.exp @@ -62,9 +62,9 @@ proc find_rawsid { } { set try "sid" } else { # testing build tree - set env(SID_LIBRARY_PATH) [join [glob "${tool_root_dir}/sid/component/*" "$srcdir/sid/component/*"] ":"] + set env(SID_LIBRARY_PATH) [join [glob $tool_root_dir/sid/component/* $srcdir/sid/component/*] ":"] # srcdir=/..../sid/component/testsuite - set tcl_library "$srcdir/tcl/library" + set tcl_library $srcdir/tcl/library global host_os switch -glob -- $host_os { {cygwin*} { set tcl_library [exec cygpath -w $tcl_library] } diff --git a/baseboards/cris-sim.exp b/baseboards/cris-sim.exp index 431a0ba..713b5cc 100644 --- a/baseboards/cris-sim.exp +++ b/baseboards/cris-sim.exp @@ -44,8 +44,8 @@ if {[istarget *-*-linux*]} { # Support different multilibs and targets. foreach x $board_variant_list { - regsub -all "^\[ \t\]*" "$x" "" x - regsub -all "\[ \t\]*$" "$x" "" x + regsub -all "^\[ \t\]*" $x "" x + regsub -all "\[ \t\]*$" $x "" x switch -- $x { # We force the arch to either pre-v32 (i.e. v10) or v32 for the diff --git a/baseboards/generic-sim.exp b/baseboards/generic-sim.exp index 62f5046..48eb4ac 100644 --- a/baseboards/generic-sim.exp +++ b/baseboards/generic-sim.exp @@ -39,7 +39,7 @@ setup_sim sim # No multilib flags are set by default. if {[info exists env(DEJAGNU_SIM_MULTILIB_OPTIONS)]} { - process_multilib_options "$env(DEJAGNU_SIM_MULTILIB_OPTIONS)" + process_multilib_options $env(DEJAGNU_SIM_MULTILIB_OPTIONS) } else { process_multilib_options "" } @@ -47,7 +47,7 @@ if {[info exists env(DEJAGNU_SIM_MULTILIB_OPTIONS)]} { # The compiler used to build for this board. This has *nothing* to do # with what compiler is tested if we're testing gcc. if {[info exists env(DEJAGNU_SIM_GCC)]} { - set_board_info compiler "$env(DEJAGNU_SIM_GCC)" + set_board_info compiler $env(DEJAGNU_SIM_GCC) } else { set_board_info compiler "[find_gcc]" } @@ -63,14 +63,14 @@ if {[info exists env(DEJAGNU_SIM_LINK_FLAGS)]} { set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]" } if {[info exists env(DEJAGNU_SIM_LDSCRIPT)]} { - set_board_info ldscript "$env(DEJAGNU_SIM_LDSCRIPT)" + set_board_info ldscript $env(DEJAGNU_SIM_LDSCRIPT) } if {[info exists env(DEJAGNU_SIM_SPECFILE)]} { set_board_info specfile "-specs=$env(DEJAGNU_SIM_SPECFILE)" } if {[info exists env(DEJAGNU_SIM_OPTIONS)]} { - set_board_info sim,options "$env(DEJAGNU_SIM_OPTIONS)" + set_board_info sim,options $env(DEJAGNU_SIM_OPTIONS) } if {[info exists env(DEJAGNU_SIM_BOARD_INFO)]} { diff --git a/baseboards/mcore-moto-sim.exp b/baseboards/mcore-moto-sim.exp index e162e34..d9db95a 100644 --- a/baseboards/mcore-moto-sim.exp +++ b/baseboards/mcore-moto-sim.exp @@ -92,7 +92,7 @@ proc sim_load { dest prog args } { set output "" - set res [remote_spawn target "${prog}"] + set res [remote_spawn target $prog] if { $res <= 0 } { return [list "fail" "remote_spawn failed"] diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp index 6e854f5..8c084cb 100644 --- a/baseboards/multi-sim.exp +++ b/baseboards/multi-sim.exp @@ -80,22 +80,22 @@ proc rpath_flags { args } { # extra hack/search so it can work. if {$rpathdir eq "."} { if {$i eq "libstdc++.so"} { - if {[file exists "$gccpath/libstdc++-v3/src/.libs/libstdc++.so"]} { + if {[file exists $gccpath/libstdc++-v3/src/.libs/libstdc++.so]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libstdc++-v3/src/.libs" } } if {$i eq "libgfortran.so"} { - if {[file exists "$gccpath/libgfortran/.libs/libgfortran.so"]} { + if {[file exists $gccpath/libgfortran/.libs/libgfortran.so]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgfortran/.libs" } } if {$i eq "libatomic.so"} { - if {[file exists "$gccpath/libatomic/.libs/libatomic.so"]} { + if {[file exists $gccpath/libatomic/.libs/libatomic.so]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libatomic/.libs" } } if {$i eq "libgomp.so"} { - if {[file exists "$gccpath/libgomp/.libs/libgomp.so"]} { + if {[file exists $gccpath/libgomp/.libs/libgomp.so]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgomp/.libs" } } @@ -120,7 +120,7 @@ setup_sim sim # No multilib flags are set by default. if {[info exists env(DEJAGNU_SIM_MULTILIB_OPTIONS)]} { - process_multilib_options "$env(DEJAGNU_SIM_MULTILIB_OPTIONS)" + process_multilib_options $env(DEJAGNU_SIM_MULTILIB_OPTIONS) } else { process_multilib_options "" } @@ -128,7 +128,7 @@ if {[info exists env(DEJAGNU_SIM_MULTILIB_OPTIONS)]} { # The compiler used to build for this board. This has *nothing* to do # with what compiler is tested if we're testing gcc. if {[info exists env(DEJAGNU_SIM_GCC)]} { - set_board_info compiler "$env(DEJAGNU_SIM_GCC)" + set_board_info compiler $env(DEJAGNU_SIM_GCC) } else { set_board_info compiler "[find_gcc]" } @@ -144,10 +144,10 @@ if {[info exists env(DEJAGNU_SIM_LINK_FLAGS)]} { set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags] [dynamic_linker_flag] [rpath_flags]" } if {[info exists env(DEJAGNU_SIM_LDSCRIPT)]} { - set_board_info ldscript "$env(DEJAGNU_SIM_LDSCRIPT)" + set_board_info ldscript $env(DEJAGNU_SIM_LDSCRIPT) } if {[info exists env(DEJAGNU_SIM_OPTIONS)]} { - set_board_info sim,options "$env(DEJAGNU_SIM_OPTIONS)" + set_board_info sim,options $env(DEJAGNU_SIM_OPTIONS) } if {[info exists env(DEJAGNU_SIM_BOARD_INFO)]} { |