MIPS/GAS/testsuite: Use a helper variable for IRIX/non-IRIX test selection

Define a helper variable for IRIX/non-IRIX test selection and use it
with the PR 14798 test case.

	gas/
	* testsuite/gas/mips/mips.exp: Use a helper variable for
	IRIX/non-IRIX test selection.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4ac6ea29a615a01357d38b76d3f52c0271cd51e4..529f9b1f63e140827cc214366c496c2d5c7b66f7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-22  Maciej W. Rozycki  <macro@linux-mips.org>
+
+       * testsuite/gas/mips/mips.exp: Use a helper variable for
+       IRIX/non-IRIX test selection.
+

 2020-07-21  Jan Beulich  <jbeulich@suse.com>
 
        * testsuite/gas/i386/evex-no-scale-64.d,
 2020-07-21  Jan Beulich  <jbeulich@suse.com>
 
        * testsuite/gas/i386/evex-no-scale-64.d,

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 51d0d1fc5d032de24da63da6a72c0a274a62f4f9..e8ff73c467d7c0eea9031dc32cef1d7863f7912d 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -575,6 +575,7 @@ if { [istarget mips*-*-vxworks*] } {
     } {
        set el ""
     }
     } {
        set el ""
     }

+    set imips [expr [istarget *-*-irix*] ? {"-irix"} : {""}]

 
     run_dump_test_arches "dot-1"       [mips_arch_list_matching mips1]
     run_dump_test_arches "abs"         [mips_arch_list_matching mips1]
 
     run_dump_test_arches "dot-1"       [mips_arch_list_matching mips1]
     run_dump_test_arches "abs"         [mips_arch_list_matching mips1]


@@ -2088,10 +2089,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "llpscp-32" [mips_arch_list_matching mips32r6]
     run_dump_test_arch "llpscp-64" "" mips64r6
 
     run_dump_test_arches "llpscp-32" [mips_arch_list_matching mips32r6]
     run_dump_test_arch "llpscp-64" "" mips64r6
 

-    if [istarget *-*-irix*] {
-       run_dump_test "pr14798-irix"
-    } else {
-       run_dump_test "pr14798"
-    }
+    run_dump_test "pr14798${imips}"

     run_dump_test "insn-isa-mode"
 }
     run_dump_test "insn-isa-mode"
 }