From 92a289b3800274d15d440cea98c0df067da4c2ec Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 24 Aug 2012 18:24:52 +0000 Subject: Use failif on ld-elf/exclude3 tests * ld-elf/exclude3a.d: Remove target and use failif. * ld-elf/exclude3b.d: Change target to *-*-linux* *-*-gnu* and use failif * ld-elf/exclude3d.d: Removed. --- ld/testsuite/ChangeLog | 9 +++++++++ ld/testsuite/ld-elf/exclude3a.d | 8 +++----- ld/testsuite/ld-elf/exclude3b.d | 8 ++++---- ld/testsuite/ld-elf/exclude3d.d | 9 --------- 4 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 ld/testsuite/ld-elf/exclude3d.d (limited to 'ld/testsuite') diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index dbca5ed..e6c2ae0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,5 +1,14 @@ 2012-08-24 H.J. Lu + * ld-elf/exclude3a.d: Remove target and use failif. + + * ld-elf/exclude3b.d: Change target to *-*-linux* *-*-gnu* and + use failif + + * ld-elf/exclude3d.d: Removed. + +2012-08-24 H.J. Lu + * ld-elf/elf.exp: Add Solaris/x86-64 support to eh[1-4] test. 2012-08-24 Matthew Gretton-Dann diff --git a/ld/testsuite/ld-elf/exclude3a.d b/ld/testsuite/ld-elf/exclude3a.d index 7343e45..2647cce 100644 --- a/ld/testsuite/ld-elf/exclude3a.d +++ b/ld/testsuite/ld-elf/exclude3a.d @@ -1,10 +1,8 @@ #source: exclude3.s #ld: #readelf: -S --wide -#target: x86_64-*-* i?86-*-* ia64-*-* +#failif +#... +[ ]*\[.*\][ ]+\.foo1[ ]+.* #... -[ ]*\[.*\][ ]+NULL.* -[ ]*\[.*\][ ]+\.text[ ]+PROGBITS.* -[ ]*\[.*\][ ]+.*STRTAB.* -#pass diff --git a/ld/testsuite/ld-elf/exclude3b.d b/ld/testsuite/ld-elf/exclude3b.d index 8d8a43f..553c30b 100644 --- a/ld/testsuite/ld-elf/exclude3b.d +++ b/ld/testsuite/ld-elf/exclude3b.d @@ -1,9 +1,9 @@ #source: exclude3.s #ld: --shared #readelf: -S --wide -#target: x86_64-*-* i?86-*-* +#target: *-*-linux* *-*-gnu* +#failif +#... +[ ]*\[.*\][ ]+\.foo1[ ]+.* #... -[ ]*\[.*\][ ]+\.dynamic[ ]+DYNAMIC.* -[ ]*\[.*\][ ]+.*STRTAB.* -#pass diff --git a/ld/testsuite/ld-elf/exclude3d.d b/ld/testsuite/ld-elf/exclude3d.d deleted file mode 100644 index 0d487f5..0000000 --- a/ld/testsuite/ld-elf/exclude3d.d +++ /dev/null @@ -1,9 +0,0 @@ -#source: exclude3.s -#ld: --shared -#readelf: -S --wide -#target: ia64-*-* - -#... -[ ]*\[.*\][ ]+\.got.*[ ]+PROGBITS.* -[ ]*\[.*\][ ]+.*STRTAB.* -#pass -- cgit v1.1