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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 44467f12065ba3e90a61d1097c4133bd8db6b2b8..4978586d1bef2f0c299f6c7b8704293a60f5dead 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-19  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * testsuite/binutils-all/mips/mips.exp: Bail out right away if
+       non-ELF.
+
 2017-05-18  Alan Modra  <amodra@gmail.com>
 
        * 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 496d9cc316f87b3ca349fc8d5a5c82bace7023d3..7949445a8f9a4161da8a01b4f9e80a5bea63c979 100644 (file)
--- 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"