diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/ar.exp | 18 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/dlltool.exp | 2 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/objcopy.exp | 56 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.exp | 10 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/windres/windres.exp | 20 | ||||
| -rw-r--r-- | binutils/testsuite/lib/utils-lib.exp | 12 |
7 files changed, 68 insertions, 59 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 0c02ead..63471da 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2004-05-12 Ben Elliston <bje@au.ibm.com> + + * binutils-all/ar.exp: Remove stray semicolons. + * binutils-all/dlltool.exp: Likewise. + * binutils-all/objcopy.exp: Likewise. + * binutils-all/readelf.exp: Likewise. + * binutils-all/windres/windres.exp: Likewise. + * lib/utils-lib.exp: Likewise. + 2004-04-14 Richard Sandiford <rsandifo@redhat.com> * binutils-all/readelf.ss-mips: Allow named section symbols. diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp index 7f01c76..2c16faf 100644 --- a/binutils/testsuite/binutils-all/ar.exp +++ b/binutils/testsuite/binutils-all/ar.exp @@ -67,14 +67,14 @@ proc long_filenames { } { close $f if [is_remote host] { - set file1 [remote_download host $file1]; - set file2 [remote_download host $file2]; + set file1 [remote_download host $file1] + set file2 [remote_download host $file2] set dest artest.a } else { set dest tmpdir/artest.a } - remote_file host delete $dest; + remote_file host delete $dest set got [binutils_run $AR "rc $dest $file1 $file2"] if [is_remote host] { @@ -90,7 +90,7 @@ proc long_filenames { } { return } - remote_file host delete $dest; + remote_file host delete $dest set got [binutils_run $AR "rc $dest $file1 $file2"] if ![string match "" $got] { @@ -102,15 +102,15 @@ proc long_filenames { } { remote_file build delete tmpdir/$n2 set got [binutils_run $AR "t $dest"] - regsub "\[\r\n \t\]*$" "$got" "" got; + regsub "\[\r\n \t\]*$" "$got" "" got if ![string match "$n1*$n2" $got] { fail $testname return } if [is_remote host] { - remote_file host delete $file1; - remote_file host delete $file2; + remote_file host delete $file1 + remote_file host delete $file2 } verbose -log "$AR x $dest" @@ -123,8 +123,8 @@ proc long_filenames { } { } if [is_remote host] { - remote_upload host $n1 tmpdir/$n1; - remote_upload host $n2 tmpdir/$n2; + remote_upload host $n1 tmpdir/$n1 + remote_upload host $n2 tmpdir/$n2 set file1 tmpdir/$n1 set file2 tmpdir/$n2 } else { diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp index 77b09eb..f061ab8 100644 --- a/binutils/testsuite/binutils-all/dlltool.exp +++ b/binutils/testsuite/binutils-all/dlltool.exp @@ -41,7 +41,7 @@ if ![string match "" $err] then { send_log "$err\n" verbose "$err" 1 fail "dlltool (fastcall export)" - continue; + continue } pass "dlltool (fastcall export)" diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index e84868b..e210f3c 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -36,8 +36,8 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { } if ![is_remote host] { - set tempfile tmpdir/bintest.o; - set copyfile tmpdir/copy; + set tempfile tmpdir/bintest.o + set copyfile tmpdir/copy } else { set tempfile [remote_download host tmpdir/bintest.o] set copyfile copy @@ -55,14 +55,14 @@ if ![string match "" $got] then { if [is_remote host] { set src1 tmpdir/bintest.o set src2 tmpdir/copy.o - remote_upload host $tempfile $src1; - remote_upload host ${copyfile}.o $src2; + remote_upload host $tempfile $src1 + remote_upload host ${copyfile}.o $src2 } else { set src1 ${tempfile} set src2 ${copyfile}.o } - set status [remote_exec build cmp "${src1} ${src2}"]; - set exec_output [lindex $status 1]; + set status [remote_exec build cmp "${src1} ${src2}"] + set exec_output [lindex $status 1] set exec_output [prune_warnings $exec_output] # On some systems the result of objcopy will not be identical. @@ -120,8 +120,8 @@ if ![string match "" $got] then { fail "objcopy -O srec" } else { if [is_remote host] { - remote_upload host ${srecfile} tmpdir/copy.srec; - set srecfile tmpdir/copy.srec; + remote_upload host ${srecfile} tmpdir/copy.srec + set srecfile tmpdir/copy.srec } set file [open ${srecfile} r] @@ -332,7 +332,7 @@ proc strip_test { } { if [is_remote host] { set archive libstrip.a - set objfile [remote_download host tmpdir/testprog.o]; + set objfile [remote_download host tmpdir/testprog.o] remote_file host delete $archive } else { set archive tmpdir/libstrip.a @@ -359,7 +359,7 @@ proc strip_test { } { } if [is_remote host] { - set objfile [remote_download host tmpdir/testprog.o]; + set objfile [remote_download host tmpdir/testprog.o] } else { set objfile tmpdir/testprog.o } @@ -400,7 +400,7 @@ proc strip_test_with_saving_a_symbol { } { } if [is_remote host] { - set objfile [remote_download host tmpdir/testprog.o]; + set objfile [remote_download host tmpdir/testprog.o] } else { set objfile tmpdir/testprog.o } @@ -437,14 +437,14 @@ proc copy_setup { } { global gcc_gas_flag global test_prog - set res [build_wrapper testglue.o]; - set flags { debug }; + set res [build_wrapper testglue.o] + set flags { debug } if { $res != "" } { - lappend flags "additional_flags=[lindex $res 1]"; - set add_libs "testglue.o"; + lappend flags "additional_flags=[lindex $res 1]" + set add_libs "testglue.o" } else { - set add_libs ""; + set add_libs "" } if { [istarget *-*-linux*] } { @@ -456,8 +456,8 @@ proc copy_setup { } { return 2 } - set result [remote_load target tmpdir/$test_prog]; - set status [lindex $result 0]; + set result [remote_load target tmpdir/$test_prog] + set status [lindex $result 0] if { $status != "pass" } { perror "unresolved setup, status = $status" @@ -473,13 +473,13 @@ proc copy_executable { prog flags test1 test2 } { global test_prog if [is_remote host] { - set testfile [remote_download host tmpdir/$test_prog]; + set testfile [remote_download host tmpdir/$test_prog] set testcopy copyprog } else { set testfile tmpdir/$test_prog set testcopy tmpdir/copyprog } - remote_file host delete $testcopy; + remote_file host delete $testcopy set exec_output [binutils_run $prog "$flags $testfile $testcopy"] @@ -494,7 +494,7 @@ proc copy_executable { prog flags test1 test2 } { } set status [remote_exec build "cmp" "tmpdir/$test_prog tmpdir/copyprog"] - set exec_output [lindex $status 1]; + set exec_output [lindex $status 1] if [string match "" $exec_output] then { pass $test1 @@ -527,7 +527,7 @@ proc copy_executable { prog flags test1 test2 } { } set output [remote_load target tmpdir/copyprog] - set status [lindex $output 0]; + set status [lindex $output 0] if { $status != "pass" } { fail $test2 } else { @@ -543,7 +543,7 @@ proc strip_executable { prog flags test } { remote_download build tmpdir/copyprog tmpdir/striprog if [is_remote host] { - set copyfile [remote_download host tmpdir/striprog]; + set copyfile [remote_download host tmpdir/striprog] } else { set copyfile tmpdir/striprog } @@ -555,11 +555,11 @@ proc strip_executable { prog flags test } { } if [is_remote host] { - remote_upload host ${copyfile} tmpdir/striprog; + remote_upload host ${copyfile} tmpdir/striprog } set result [remote_load target tmpdir/striprog] - set status [lindex $result 0]; + set status [lindex $result 0] if { $status != "pass" } { fail $test return @@ -581,7 +581,7 @@ proc strip_executable_with_saving_a_symbol { prog flags test } { remote_download build tmpdir/copyprog tmpdir/striprog if [is_remote host] { - set copyfile [remote_download host tmpdir/striprog]; + set copyfile [remote_download host tmpdir/striprog] } else { set copyfile tmpdir/striprog } @@ -593,11 +593,11 @@ proc strip_executable_with_saving_a_symbol { prog flags test } { } if [is_remote host] { - remote_upload host ${copyfile} tmpdir/striprog; + remote_upload host ${copyfile} tmpdir/striprog } set result [remote_load target tmpdir/striprog] - set status [lindex $result 0]; + set status [lindex $result 0] if { $status != "pass" } { fail $test return diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp index 4c5f99e..4835ef9 100644 --- a/binutils/testsuite/binutils-all/readelf.exp +++ b/binutils/testsuite/binutils-all/readelf.exp @@ -245,16 +245,16 @@ proc readelf_wi_test {} { } # Download it. - set tempfile [remote_download host tmpdir/testprog.o]; + set tempfile [remote_download host tmpdir/testprog.o] # Run "readelf -wi" on it. send_log "exec $READELF $READELFFLAGS -wi $tempfile > readelf.out\n" catch "exec $READELF $READELFFLAGS -wi $tempfile > readelf.out" got # Upload the results. - set output [remote_upload host readelf.out]; + set output [remote_upload host readelf.out] - file_on_host delete $tempfile; + file_on_host delete $tempfile # Strip any superflous warnings. set got [prune_readelf_wi_warnings $got] @@ -296,7 +296,7 @@ proc readelf_wi_test {} { } } - file_on_host delete $output; + file_on_host delete $output # All done. pass "readelf -wi" @@ -326,7 +326,7 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { } if ![is_remote host] { - set tempfile tmpdir/bintest.o; + set tempfile tmpdir/bintest.o } else { set tempfile [remote_download host tmpdir/bintest.o] } diff --git a/binutils/testsuite/binutils-all/windres/windres.exp b/binutils/testsuite/binutils-all/windres/windres.exp index bd76178..e42eee3 100644 --- a/binutils/testsuite/binutils-all/windres/windres.exp +++ b/binutils/testsuite/binutils-all/windres/windres.exp @@ -73,7 +73,7 @@ foreach res $res_list { } if [regexp "\[xp\]fail *(\[^ \]*)" $line junk sys] { setup_xfail $sys - continue; + continue } } @@ -88,7 +88,7 @@ foreach res $res_list { send_log "$err\n" verbose "$err" 1 fail "windres/$broot (parse)" - continue; + continue } pass "windres/$broot (parse)" @@ -100,15 +100,15 @@ foreach res $res_list { if [regexp "parse-only" $line] { file delete "tmpdir/$broot.res" set done 1 - break; + break } if [regexp "\[xc\]fail *(\[^ \]*)" $line junk sys] { setup_xfail $sys - continue; + continue } } if { $done != 0 } { - continue; + continue } if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } { @@ -122,7 +122,7 @@ foreach res $res_list { send_log "$err\n" verbose "$err" 1 fail "windres/$broot (compare)" - continue; + continue } set pat [open "$sroot.rsd"] @@ -134,11 +134,11 @@ foreach res $res_list { set outline [oneline $out] if ![string match $patline $outline] { - send_log "< $patline\n"; - send_log "> $outline\n"; - fail "windres/$broot (compare)"; + send_log "< $patline\n" + send_log "> $outline\n" + fail "windres/$broot (compare)" set done 1 - break; + break } } if { $done == 0 } { diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp index 11860f7..1bb7607 100644 --- a/binutils/testsuite/lib/utils-lib.exp +++ b/binutils/testsuite/lib/utils-lib.exp @@ -23,7 +23,7 @@ proc binutil_version { prog } { if ![is_remote host] { - set path [which $prog]; + set path [which $prog] if {$path == 0} then { perror "$prog can't be run, file not found." return "" @@ -31,8 +31,8 @@ proc binutil_version { prog } { } else { set path $prog } - set state [remote_exec host $prog --version]; - set tmp "[lindex $state 1]\n"; + set state [remote_exec host $prog --version] + set tmp "[lindex $state 1]\n" # Should find a way to discard constant parts, keep whatever's # left, so the version string could be almost anything at all... regexp "\[^\n\]* (cygnus-|)(\[-0-9.a-zA-Z-\]+)\[\r\n\].*" "$tmp" version cyg number @@ -69,7 +69,7 @@ proc default_binutils_run { prog progargs } { regsub -all "\\$" "$progargs" "\\$" progargs set state [remote_exec host $prog $progargs] - set exec_output [prune_warnings [lindex $state 1]]; + set exec_output [prune_warnings [lindex $state 1]] if {![string match "" $exec_output]} then { send_log "$exec_output\n" verbose "$exec_output" @@ -95,11 +95,11 @@ proc default_binutils_assemble { source object } { set sed_file $srcdir/config/hppa.sed send_log "sed -f $sed_file < $source > asm.s\n" verbose "sed -f $sed_file < $source > asm.s" - catch "exec sed -f $sed_file < $source > asm.s"; + catch "exec sed -f $sed_file < $source > asm.s" set source asm.s } - set exec_output [target_assemble $source $object ""]; + set exec_output [target_assemble $source $object ""] set exec_output [prune_warnings $exec_output] if [string match "" $exec_output] { |