sim: testsuite: drop most specific istarget checks

We'll rely on the toolchain probing to determine whether each arch's tests can be run rather the current configure target. This allows testing all of the ports in a multitarget configuration. For now, we don't reformat the files entirely to make it easier to review, and in case we need to make adjustments. Once this feels like it's stable, we can flatten the code a bit by removing the if statement entirely.
5 years ago · b42f20d2ac
42 changed files with 42 additions and 47 deletions
--- a/sim/testsuite/aarch64/allinsn.exp
+++ b/sim/testsuite/aarch64/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget aarch64*-*] {
+if [istarget *] {
    # all machines
    set all_machs "aarch64"

--- a/sim/testsuite/arm/allinsn.exp
+++ b/sim/testsuite/arm/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
    # all machines
    set all_machs "xscale"

--- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
@ -2,7 +2,7 @@

 sim_init

-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
    # all machines
    set all_machs "xscale"

--- a/sim/testsuite/arm/misc.exp
+++ b/sim/testsuite/arm/misc.exp
@ -2,7 +2,7 @@

 sim_init

-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
    # all machines
    set all_machs "arm7tdmi"

--- a/sim/testsuite/arm/thumb/allthumb.exp
+++ b/sim/testsuite/arm/thumb/allthumb.exp
@ -2,7 +2,7 @@

 sim_init

-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
    # all machines
    set all_machs "arm7tdmi"

--- a/sim/testsuite/arm/xscale/xscale.exp
+++ b/sim/testsuite/arm/xscale/xscale.exp
@ -2,7 +2,7 @@

 sim_init

-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
    # all machines
    set all_machs "xscale"

--- a/sim/testsuite/avr/allinsn.exp
+++ b/sim/testsuite/avr/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget avr-*] {
+if [istarget *] {
    # all machines
    set all_machs "avr"

--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@ -6,7 +6,7 @@ global CFLAGS_FOR_TARGET_init
 set CFLAGS_FOR_TARGET_init "-mcpu=bf537"
 sim_init

-if [istarget bfin-*-elf] {
+if [istarget *] {
    # all machines
    set all_machs "bfin"

--- a/sim/testsuite/bpf/allinsn.exp
+++ b/sim/testsuite/bpf/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget bpf-unknown-none] {
+if [istarget *] {
    # all machines
    set all_machs "bpf"

--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget cr16*-*-*] {
+if [istarget *] {
    # all machines
    set all_machs "cr16"

--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget cr16*-*-*] {
+if [istarget *] {
    # all machines
    set all_machs "cr16"

--- a/sim/testsuite/cris/asm/asm.exp
+++ b/sim/testsuite/cris/asm/asm.exp
@ -17,7 +17,7 @@

 sim_init

-if [istarget cris*-*-*] {
+if [istarget *] {
    global ASFLAGS_FOR_TARGET
    # All machines we test and the corresponding assembler option.  Needs
    # update if we build the simulator for crisv0 crisv3 and crisv8 too.
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@ -17,10 +17,6 @@

 sim_init

-if ![istarget cris*-*-*] {
-    return
-}
-
 set CFLAGS_FOR_TARGET "-O2"
 if [istarget cris-*-*] {
    set mach "crisv10"
@ -28,7 +24,7 @@ if [istarget cris-*-*] {
    set mach "crisv32"
 }

-if [istarget cris*-*-elf] {
+if [istarget *] {
    append CFLAGS_FOR_TARGET " -sim"
 }

--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@ -116,7 +116,7 @@ proc slurp_rv { file } {

 # The main test loop.

-if [istarget cris*-*-*] {
+if [istarget *] {
    global ASFLAGS_FOR_TARGET
    global LDFLAGS_FOR_TARGET
    global SIMFLAGS_FOR_TARGET
--- a/sim/testsuite/d10v/allinsn.exp
+++ b/sim/testsuite/d10v/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget d10v*-*] {
+if [istarget *] {
    # all machines
    set all_machs "d10v"

--- a/sim/testsuite/frv/allinsn.exp
+++ b/sim/testsuite/frv/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "frv fr500 fr550 fr400 fr405 fr450"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/cache.ms
+++ b/sim/testsuite/frv/cache.ms
@ -1,6 +1,6 @@
 # mach: frv fr500 fr550
 # sim: --memory-region 0xff000000,4 --memory-region 0xfe000000,00404000
-# xfail: "crashes with bad write" frv-*
+# xfail: "crashes with bad write" *-*

 ; Exit with return code

--- a/sim/testsuite/frv/fr400/allinsn.exp
+++ b/sim/testsuite/frv/fr400/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "fr400 fr405 fr450 fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/fr500/allinsn.exp
+++ b/sim/testsuite/frv/fr500/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "frv fr500 fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/fr550/allinsn.exp
+++ b/sim/testsuite/frv/fr550/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/interrupts.exp
+++ b/sim/testsuite/frv/interrupts.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "frv fr500 fr550 fr400"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/misc.exp
+++ b/sim/testsuite/frv/misc.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "frv fr500 fr550 fr400 fr405 fr450"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/parallel.exp
+++ b/sim/testsuite/frv/parallel.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget frv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "frv fr500 fr550 fr400"
    set cpu_option -mcpu
--- a/sim/testsuite/ft32/allinsn.exp
+++ b/sim/testsuite/ft32/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget ft32-*] {
+if [istarget *] {
    # all machines
    set all_machs "ft32"

--- a/sim/testsuite/h8300/allinsn.exp
+++ b/sim/testsuite/h8300/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if {[istarget h8300*-*-*] || [istarget h8sx*-*-*]} then {
+if {[istarget *]} {
    set all_machs "h8300 h8300h h8300s h8sx"

    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
--- a/sim/testsuite/iq2000/allinsn.exp
+++ b/sim/testsuite/iq2000/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget iq2000-*] {
+if [istarget *] {
    # all machines
    set all_machs "iq2000"

--- a/sim/testsuite/lm32/allinsn.exp
+++ b/sim/testsuite/lm32/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget lm32-*] {
+if [istarget *] {
    # all machines
    set all_machs "lm32"

--- a/sim/testsuite/m32c/allinsn.exp
+++ b/sim/testsuite/m32c/allinsn.exp
@ -3,7 +3,7 @@

 sim_init

-if [istarget m32c*-*-*] {
+if [istarget *] {
    # all machines
    set all_machs "m32c"

--- a/sim/testsuite/m32r/allinsn.exp
+++ b/sim/testsuite/m32r/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget m32r*-*-*] {
+if [istarget *] {
    # all machines
    set all_machs "m32r"

--- a/sim/testsuite/m32r/misc.exp
+++ b/sim/testsuite/m32r/misc.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget m32r*-*-*] {
+if [istarget *] {
    # all machines
    set all_machs "m32r"

--- a/sim/testsuite/m68hc11/allinsn.exp
+++ b/sim/testsuite/m68hc11/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget m68hc11-*] {
+if [istarget *] {
    # all machines
    set all_machs "m68hc11"

--- a/sim/testsuite/mcore/allinsn.exp
+++ b/sim/testsuite/mcore/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget mcore-*] {
+if [istarget *] {
    # all machines
    set all_machs "mcore"

--- a/sim/testsuite/microblaze/allinsn.exp
+++ b/sim/testsuite/microblaze/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget microblaze-*] {
+if [istarget *] {
    # all machines
    set all_machs "microblaze"

--- a/sim/testsuite/mips/basic.exp
+++ b/sim/testsuite/mips/basic.exp
@ -41,8 +41,7 @@ proc run_sim_tests { name requested_machs { requested_micromips_machs "" } } {
    run_micromips_test $name $requested_micromips_machs
 }

-# Only test mips*-*-elf (e.g., no mips*-*-linux)
-if {[istarget mips*-*-elf]} {
+if {[istarget *]} {
    set dspmodels ""
    set mdmxmodels ""
    set micromipsmodels ""
--- a/sim/testsuite/mn10300/allinsn.exp
+++ b/sim/testsuite/mn10300/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget mn10300-*] {
+if [istarget *] {
    # all machines
    set all_machs "mn10300"

--- a/sim/testsuite/moxie/allinsn.exp
+++ b/sim/testsuite/moxie/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget moxie-*] {
+if [istarget *] {
    # all machines
    set all_machs "moxie"

--- a/sim/testsuite/msp430/allinsn.exp
+++ b/sim/testsuite/msp430/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget msp430-*] {
+if [istarget *] {
    # all machines
    set all_machs "msp430"

--- a/sim/testsuite/or1k/alltests.exp
+++ b/sim/testsuite/or1k/alltests.exp
@ -17,7 +17,7 @@

 sim_init

-if [istarget or1k*-*-*] {
+if [istarget *] {
    set all_machs "or1k"

    global LDFLAGS_FOR_TARGET
--- a/sim/testsuite/pru/allinsn.exp
+++ b/sim/testsuite/pru/allinsn.exp
@ -20,7 +20,7 @@

 sim_init

-if [istarget pru-*] {
+if [istarget *] {
    # all machines
    set all_machs "pru"

--- a/sim/testsuite/riscv/allinsn.exp
+++ b/sim/testsuite/riscv/allinsn.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget riscv*-*] {
+if [istarget *] {
    # all machines
    set all_machs "riscv"

--- a/sim/testsuite/sh/allinsn.exp
+++ b/sim/testsuite/sh/allinsn.exp
@ -14,7 +14,7 @@ foreach opt $board_variant_list {
    }
 }

-if [istarget sh-*elf] {
+if [istarget *] {
    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
 	run_sim_test $src $all_machs
    }
--- a/sim/testsuite/v850/allinsns.exp
+++ b/sim/testsuite/v850/allinsns.exp
@ -2,7 +2,7 @@

 sim_init

-if [istarget v850*-*] {
+if [istarget *] {
    # All machines.
    # Should add more cpus if the testsuite adds coverage for their insns, but
    # at the core level, there's no deviation beyond these two.