This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
gas testsuite cleanups
- From: Ben Elliston <bje at au1 dot ibm dot com>
- To: binutils at sources dot redhat dot com
- Date: 12 May 2004 13:04:48 +1000
- Subject: gas testsuite cleanups
I've just committed the following cleanups to the gas testsuite. It's
the first step in tidying up and improving the consistency of the
testsuite code.
Ben
2004-05-12 Ben Elliston <bje@au.ibm.com>
* gas/h8300/t03_add.exp: Remove stray semicolons.
* gas/h8300/t04_sub.exp: Likewise.
* gas/h8300/t05_cmp.exp: Likewise.
* gas/h8300/t08_or.exp: Likewise.
* gas/h8300/t09_xor.exp: Likewise.
* gas/h8300/t10_and.exp: Likewise.
* gas/hppa/reloc/reloc.exp: Likewise.
* gas/hppa/unsorted/unsorted.exp: Likewise.
* gas/i386/i386.exp: Likewise.
* gas/m68hc11/m68hc11.exp: Likewise.
* gas/mips/mips.exp: Likewise.
* gas/sparc/sparc.exp: Likewise.
* lib/gas-defs.exp: Likewise.
Index: gas/h8300/t03_add.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t03_add.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t03_add.exp
--- gas/h8300/t03_add.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t03_add.exp 12 May 2004 03:00:04 -0000
@@ -2940,7 +2940,7 @@ proc do_t03_add_test {} {
default { fail "$testname: add.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 960 1f44 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/h8300/t04_sub.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t04_sub.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t04_sub.exp
--- gas/h8300/t04_sub.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t04_sub.exp 12 May 2004 03:00:06 -0000
@@ -2939,7 +2939,7 @@ proc do_t04_sub_test {} {
default { fail "$testname: sub.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 959 1f42 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/h8300/t05_cmp.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t05_cmp.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t05_cmp.exp
--- gas/h8300/t05_cmp.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t05_cmp.exp 12 May 2004 03:00:07 -0000
@@ -2800,7 +2800,7 @@ proc do_t05_cmp_test {} {
default { fail "$testname: cmp.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 903 1e00 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/h8300/t08_or.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t08_or.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t08_or.exp
--- gas/h8300/t08_or.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t08_or.exp 12 May 2004 03:00:08 -0000
@@ -2921,7 +2921,7 @@ proc do_t08_or_test {} {
default { fail "$testname: or.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/h8300/t09_xor.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t09_xor.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t09_xor.exp
--- gas/h8300/t09_xor.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t09_xor.exp 12 May 2004 03:00:10 -0000
@@ -2921,7 +2921,7 @@ proc do_t09_xor_test {} {
default { fail "$testname: xor.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/h8300/t10_and.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/h8300/t10_and.exp,v
retrieving revision 1.1
diff -u -p -r1.1 t10_and.exp
--- gas/h8300/t10_and.exp 5 Jun 2003 18:52:00 -0000 1.1
+++ gas/h8300/t10_and.exp 12 May 2004 03:00:11 -0000
@@ -2921,7 +2921,7 @@ proc do_t10_and_test {} {
default { fail "$testname: and.l @0x1234:16, ... ($x)" }
}
# FIXME return early, expect bombs out on the next group.
- return;
+ return
set x 0
expect {
-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
Index: gas/hppa/reloc/reloc.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/hppa/reloc/reloc.exp,v
retrieving revision 1.8
diff -u -p -r1.8 reloc.exp
--- gas/hppa/reloc/reloc.exp 9 Sep 2002 01:54:43 -0000 1.8
+++ gas/hppa/reloc/reloc.exp 12 May 2004 03:00:11 -0000
@@ -68,7 +68,7 @@ proc do_relocation_reduction_tests {} {
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
- return;
+ return
}
if [gas_test_old "reduce.s" "" "Relocation reductions (part1)"] then {
@@ -245,7 +245,7 @@ proc do_selector_scope_test {} {
set x 0
if [istarget hppa*64*-*-*] then {
- return;
+ return
}
if [gas_test_old "selectorbug.s" "" "Test scope of field selector (part 1)"] {
@@ -348,7 +348,7 @@ proc do_exit_relocation_test {} {
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
gas_test_old "exitbug.s" "" "Test for bogus R_EXIT relocation (part 1)"
- return;
+ return
}
if [gas_test_old "exitbug.s" "" "Test for bogus R_EXIT relocation (part 1)"] {
@@ -381,7 +381,7 @@ proc do_cross_space_fixup_test_1 {} {
# ELF doesn't really handle extra sections too well...
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
- return;
+ return
}
if [gas_test_old "fixupbug.s" "" "Test cross space jump/call fixup bug (part 1)"] {
@@ -415,7 +415,7 @@ proc do_cross_space_fixup_test_2 {} {
# ELF doesn't really handle extra sections too well...
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
- return;
+ return
}
gas_start "fixupbug.s" "-al"
@@ -600,7 +600,7 @@ proc do_pic_relocation_test {} {
# ELF doesn't really handle extra sections too well...
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
- return;
+ return
}
gas_start "picreloc.s" "-al"
@@ -629,7 +629,7 @@ proc do_apply_test {} {
# ELF doesn't really handle extra sections too well...
if {[istarget hppa*64*-*-*]
|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
- return;
+ return
}
gas_start "applybug.s" "-al"
Index: gas/hppa/unsorted/unsorted.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/hppa/unsorted/unsorted.exp,v
retrieving revision 1.7
diff -u -p -r1.7 unsorted.exp
--- gas/hppa/unsorted/unsorted.exp 9 Sep 2002 01:54:43 -0000 1.7
+++ gas/hppa/unsorted/unsorted.exp 12 May 2004 03:00:11 -0000
@@ -197,7 +197,7 @@ proc do_import_test {} {
proc do_common_test {} {
# linux has a different .comm syntax
if [istarget hppa*-*-linux*] then {
- return;
+ return
}
set testname "common.s: Test for bug in .comm handling (part2)"
Index: gas/i386/i386.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/i386/i386.exp,v
retrieving revision 1.22
diff -u -p -r1.22 i386.exp
--- gas/i386/i386.exp 20 Apr 2004 12:17:15 -0000 1.22
+++ gas/i386/i386.exp 12 May 2004 03:00:11 -0000
@@ -20,7 +20,7 @@ proc gas_64_check { } {
global srcdir
catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
- return [regexp "targets:.*x86-64" $nm_help];
+ return [regexp "targets:.*x86-64" $nm_help]
}
proc gas_32_check { } {
@@ -29,7 +29,7 @@ proc gas_32_check { } {
global srcdir
catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
- return [regexp "targets:.*i386" $nm_help];
+ return [regexp "targets:.*i386" $nm_help]
}
Index: gas/m68hc11/m68hc11.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/m68hc11/m68hc11.exp,v
retrieving revision 1.5
diff -u -p -r1.5 m68hc11.exp
--- gas/m68hc11/m68hc11.exp 27 Mar 2004 10:43:58 -0000 1.5
+++ gas/m68hc11/m68hc11.exp 12 May 2004 03:00:11 -0000
@@ -43,7 +43,7 @@ proc gas_m68hc11_message { kind options
regsub -all "\n" "$line: $expect" " " title
# Make a file containing the instructions to assemble.
- set fd [open "$srcdir/$subdir/tst-m68hc1x.s" "w"];
+ set fd [open "$srcdir/$subdir/tst-m68hc1x.s" "w"]
puts -nonewline $fd "$line"
close $fd
Index: gas/mips/mips.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/mips/mips.exp,v
retrieving revision 1.90
diff -u -p -r1.90 mips.exp
--- gas/mips/mips.exp 7 May 2004 16:39:26 -0000 1.90
+++ gas/mips/mips.exp 12 May 2004 03:00:12 -0000
@@ -254,7 +254,7 @@ proc mips_arch_list_matching {args} {
# properties actually are.
if { [string compare $arch default] == 0
&& [string length [mips_arch_properties default]] == 0} {
- continue;
+ continue
}
if { [mips_arch_matches $arch $args] } {
lappend l $arch
Index: gas/sparc/sparc.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/sparc/sparc.exp,v
retrieving revision 1.6
diff -u -p -r1.6 sparc.exp
--- gas/sparc/sparc.exp 21 Jan 2003 15:54:09 -0000 1.6
+++ gas/sparc/sparc.exp 12 May 2004 03:00:12 -0000
@@ -13,7 +13,7 @@ proc gas_64_check { } {
global srcdir
catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
- return [regexp "elf64\[_-\]sparc" $nm_help];
+ return [regexp "elf64\[_-\]sparc" $nm_help]
}
proc sparc_elf_setup { } {
Index: lib/gas-defs.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/lib/gas-defs.exp,v
retrieving revision 1.17
diff -u -p -r1.17 gas-defs.exp
--- lib/gas-defs.exp 22 Apr 2004 20:27:41 -0000 1.17
+++ lib/gas-defs.exp 12 May 2004 03:00:12 -0000
@@ -45,7 +45,7 @@ proc gas_run { prog as_opts redir } {
catch "exec $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" comp_output
set comp_output [prune_warnings $comp_output]
verbose "output was $comp_output"
- return [list $comp_output ""];
+ return [list $comp_output ""]
}
proc all_ones { args } {