From dd47d677f0164800ceba1ab67f6cd2add0021101 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Fri, 19 May 2017 07:53:21 +0100 Subject: [PATCH] MIPS/binutils/testsuite: Bail out right away if !ELF We have but ELF binutils tests in the MIPS subset, and non-ELF MIPS/GAS ports are gone, making a future addition of any non-ELF tests unlikely. Bail out right away then if non-ELF, consuming one level of indentation across the actual tests run. binutils/ * testsuite/binutils-all/mips/mips.exp: Bail out right away if non-ELF. --- binutils/ChangeLog | 5 +++++ binutils/testsuite/binutils-all/mips/mips.exp | 32 +++++++++++++-------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 44467f1..4978586 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2017-05-19 Maciej W. Rozycki + + * testsuite/binutils-all/mips/mips.exp: Bail out right away if + non-ELF. + 2017-05-18 Alan Modra * strings.c: Don't compare boolean values against TRUE or FALSE. diff --git a/binutils/testsuite/binutils-all/mips/mips.exp b/binutils/testsuite/binutils-all/mips/mips.exp index 496d9cc..7949445 100644 --- a/binutils/testsuite/binutils-all/mips/mips.exp +++ b/binutils/testsuite/binutils-all/mips/mips.exp @@ -15,7 +15,7 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, # MA 02110-1301, USA. -if ![istarget mips*-*-*] { +if {![istarget mips*-*-*] || ![is_elf_format]} { return } @@ -27,19 +27,17 @@ if [is_remote host] { set copyfile tmpdir/copy } -if [is_elf_format] { - run_dump_test "mips-ase-1" - run_dump_test "mips-ase-2" - run_dump_test "mips-ase-3" - run_dump_test "mixed-mips16" - run_dump_test "mixed-micromips" - run_dump_test "mixed-mips16-micromips" - run_dump_test "mips16-undecoded" - run_dump_test "mips16e2-undecoded" - run_dump_test "mips16-pcrel" - run_dump_test "mips16-extend-noinsn" - run_dump_test "mips16-extend-insn" - run_dump_test "mips16e2-extend-insn" - run_dump_test "mips16-alias" - run_dump_test "mips16-noalias" -} +run_dump_test "mips-ase-1" +run_dump_test "mips-ase-2" +run_dump_test "mips-ase-3" +run_dump_test "mixed-mips16" +run_dump_test "mixed-micromips" +run_dump_test "mixed-mips16-micromips" +run_dump_test "mips16-undecoded" +run_dump_test "mips16e2-undecoded" +run_dump_test "mips16-pcrel" +run_dump_test "mips16-extend-noinsn" +run_dump_test "mips16-extend-insn" +run_dump_test "mips16e2-extend-insn" +run_dump_test "mips16-alias" +run_dump_test "mips16-noalias" -- 2.7.4