diff options
| -rw-r--r-- | gas/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/testsuite/gas/elf/elf.exp | 8 | ||||
| -rw-r--r-- | gas/testsuite/gas/elf/section0.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/elf/section1.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/lib/gas-defs.exp | 14 |
5 files changed, 27 insertions, 8 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index bc63762..2246bcf 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,12 @@ +Mon Oct 11 13:37:51 1999 Geoffrey Keating <geoffk@cygnus.com> + + * lib/gas-defs.exp (regexp_diff): Allow '#...' to mean "some + indeterminate number of extra lines here". + + * gas/elf/elf.exp: Remove XFAILs. + * gas/elf/section0.d: Make pass on MIPS (and hopefully alpha). + * gas/elf/section1.d: Likewise. + Thu Oct 7 00:12:04 MDT 1999 Diego Novillo <dnovillo@cygnus.com> * gas/d10v: New directory. diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp index db06d96..216f2ac 100644 --- a/gas/testsuite/gas/elf/elf.exp +++ b/gas/testsuite/gas/elf/elf.exp @@ -10,14 +10,6 @@ if { ([istarget "*-*-elf*"] && ![istarget *-*-linux*aout*] && ![istarget *-*-linux*oldld*] } then { - - # FIXME: This doesn't work for MIPS and alpha targets because of - # the .reginfo and .mdebug sections. - setup_xfail mips*-*-* - setup_xfail alpha*-*-* run_dump_test "section0" - - setup_xfail mips*-*-* - setup_xfail alpha*-*-* run_dump_test "section1" } diff --git a/gas/testsuite/gas/elf/section0.d b/gas/testsuite/gas/elf/section0.d index 60547c2..c674a65 100644 --- a/gas/testsuite/gas/elf/section0.d +++ b/gas/testsuite/gas/elf/section0.d @@ -6,6 +6,8 @@ Contents of section .text: Contents of section .data: 0000 0000 .. +# The MIPS includes a 'section .reginfo' and such here. +#... Contents of section A: 0000 010101 ... Contents of section B: diff --git a/gas/testsuite/gas/elf/section1.d b/gas/testsuite/gas/elf/section1.d index 52a16a3..de052f5 100644 --- a/gas/testsuite/gas/elf/section1.d +++ b/gas/testsuite/gas/elf/section1.d @@ -6,6 +6,8 @@ Contents of section .text: Contents of section .data: 0000 000000 ... +# The MIPS includes a 'section .reginfo' and such here. +#... Contents of section A: 0000 01010101 0101 ...... Contents of section B: diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp index 48e84b2..ffa5f68 100644 --- a/gas/testsuite/lib/gas-defs.exp +++ b/gas/testsuite/lib/gas-defs.exp @@ -495,6 +495,20 @@ proc regexp_diff { file_1 file_2 } { set end_2 1 set diff_pass 1 break + } elseif [ string match "#..." $line_b ] { + if { [gets $file_b line_b] == $eof } { + set end_2 1 + break + } + verbose "looking for \"^$line_b$\"" 3 + while { ![regexp "^$line_b$" "$line_a"] } { + verbose "skipping \"$line_a\"" 3 + if { [gets $file_a line_a] == $eof } { + set end_1 1 + break + } + } + break } if { [gets $file_b line_b] == $eof } { set end_2 1 |