From d0b2f561a1e8ef6ecf87a99f220262d58538c750 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 23 Jun 2021 23:23:27 -0400 Subject: [PATCH] sim: testsuite: cleanup the istarget * logic Now that the multitarget testing has settled, clean up the cases where istarget * is used. This ends up being mostly style unindenting. --- sim/testsuite/aarch64/allinsn.exp | 17 ++++---- sim/testsuite/arm/allinsn.exp | 22 +++++------ sim/testsuite/arm/iwmmxt/iwmmxt.exp | 22 +++++------ sim/testsuite/arm/misc.exp | 22 +++++------ sim/testsuite/arm/thumb/allthumb.exp | 22 +++++------ sim/testsuite/arm/xscale/xscale.exp | 22 +++++------ sim/testsuite/avr/allinsn.exp | 17 ++++---- sim/testsuite/bfin/allinsn.exp | 17 ++++---- sim/testsuite/bpf/allinsn.exp | 26 ++++++------ sim/testsuite/cr16/allinsn.exp | 28 ++++++------- sim/testsuite/cr16/misc.exp | 28 ++++++------- sim/testsuite/cris/asm/asm.exp | 48 +++++++++++------------ sim/testsuite/d10v/allinsn.exp | 17 ++++---- sim/testsuite/example-synacor/allinsn.exp | 21 +++++----- sim/testsuite/frv/allinsn-a-b.exp | 3 +- sim/testsuite/frv/allinsn-c.exp | 3 +- sim/testsuite/frv/allinsn-d-h.exp | 3 +- sim/testsuite/frv/allinsn-i-l.exp | 3 +- sim/testsuite/frv/allinsn-m.exp | 3 +- sim/testsuite/frv/allinsn-n.exp | 3 +- sim/testsuite/frv/allinsn-o-s.exp | 3 +- sim/testsuite/frv/allinsn-t-z.exp | 3 +- sim/testsuite/frv/fr400/allinsn.exp | 21 +++++----- sim/testsuite/frv/fr500/allinsn.exp | 21 +++++----- sim/testsuite/frv/fr550/allinsn.exp | 21 +++++----- sim/testsuite/frv/interrupts.exp | 21 +++++----- sim/testsuite/frv/misc.exp | 21 +++++----- sim/testsuite/frv/parallel.exp | 21 +++++----- sim/testsuite/ft32/allinsn.exp | 17 ++++---- sim/testsuite/h8300/allinsn.exp | 16 +++----- sim/testsuite/iq2000/allinsn.exp | 17 ++++---- sim/testsuite/lm32/allinsn.exp | 17 ++++---- sim/testsuite/m32c/allinsn.exp | 17 ++++---- sim/testsuite/m32r/allinsn.exp | 23 +++++------ sim/testsuite/m32r/misc.exp | 23 +++++------ sim/testsuite/m68hc11/allinsn.exp | 17 ++++---- sim/testsuite/mcore/allinsn.exp | 17 ++++---- sim/testsuite/microblaze/allinsn.exp | 17 ++++---- sim/testsuite/mn10300/allinsn.exp | 17 ++++---- sim/testsuite/moxie/allinsn.exp | 17 ++++---- sim/testsuite/msp430/allinsn.exp | 17 ++++---- sim/testsuite/or1k/alltests.exp | 19 ++++----- sim/testsuite/pru/allinsn.exp | 17 ++++---- sim/testsuite/riscv/allinsn.exp | 17 ++++---- sim/testsuite/sh/allinsn.exp | 6 +-- sim/testsuite/v850/allinsns.exp | 29 ++++++-------- 46 files changed, 332 insertions(+), 467 deletions(-) diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp index e09d15739b3..abc11462f09 100644 --- a/sim/testsuite/aarch64/allinsn.exp +++ b/sim/testsuite/aarch64/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "aarch64" +# all machines +set all_machs "aarch64" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp index da28b69e51a..95a5759a568 100644 --- a/sim/testsuite/arm/allinsn.exp +++ b/sim/testsuite/arm/allinsn.exp @@ -2,18 +2,14 @@ sim_init -if { [istarget *] } { - # all machines - set all_machs "xscale" - - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "xscale" + +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp index 19a78a201ed..3e0fb333429 100644 --- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp +++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp @@ -2,18 +2,14 @@ sim_init -if { [istarget *] } { - # all machines - set all_machs "xscale" - - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "xscale" + +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/arm/misc.exp b/sim/testsuite/arm/misc.exp index 47d714cce2f..5ba5f648bb1 100644 --- a/sim/testsuite/arm/misc.exp +++ b/sim/testsuite/arm/misc.exp @@ -2,18 +2,14 @@ sim_init -if { [istarget *] } { - # all machines - set all_machs "arm7tdmi" - - # The .ms suffix is for "miscellaneous .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "arm7tdmi" + +# The .ms suffix is for "miscellaneous .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp index 36eb29c08f0..db1d00d1318 100644 --- a/sim/testsuite/arm/thumb/allthumb.exp +++ b/sim/testsuite/arm/thumb/allthumb.exp @@ -2,18 +2,14 @@ sim_init -if { [istarget *] } { - # all machines - set all_machs "arm7tdmi" - - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "arm7tdmi" + +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp index 80faf5c119f..0e5a7549b54 100644 --- a/sim/testsuite/arm/xscale/xscale.exp +++ b/sim/testsuite/arm/xscale/xscale.exp @@ -2,18 +2,14 @@ sim_init -if { [istarget *] } { - # all machines - set all_machs "xscale" - - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "xscale" + +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp index 56b6e396881..4664686fb5a 100644 --- a/sim/testsuite/avr/allinsn.exp +++ b/sim/testsuite/avr/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "avr" +# all machines +set all_machs "avr" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp index d6a45304e36..fccad36c866 100644 --- a/sim/testsuite/bfin/allinsn.exp +++ b/sim/testsuite/bfin/allinsn.exp @@ -6,16 +6,13 @@ global CFLAGS_FOR_TARGET_init set CFLAGS_FOR_TARGET_init "-mcpu=bf537" sim_init -if [istarget *] { - # all machines - set all_machs "bfin" +# all machines +set all_machs "bfin" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.\[csS\]]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.\[csS\]]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp index 88752b8e568..98f0346776a 100644 --- a/sim/testsuite/bpf/allinsn.exp +++ b/sim/testsuite/bpf/allinsn.exp @@ -2,23 +2,19 @@ sim_init -if [istarget *] { - # all machines - set all_machs "bpf" +# all machines +set all_machs "bpf" - global SIMFLAGS_FOR_TARGET - set SIMFLAGS_FOR_TARGET "--memory-size=4Mb" +global SIMFLAGS_FOR_TARGET +set SIMFLAGS_FOR_TARGET "--memory-size=4Mb" - global LDFLAGS_FOR_TARGET - set LDFLAGS_FOR_TARGET "-Ttext=0x0" +global LDFLAGS_FOR_TARGET +set LDFLAGS_FOR_TARGET "-Ttext=0x0" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp index 39b464a85ff..1bdda16635b 100644 --- a/sim/testsuite/cr16/allinsn.exp +++ b/sim/testsuite/cr16/allinsn.exp @@ -2,23 +2,19 @@ sim_init -if [istarget *] { - # all machines - set all_machs "cr16" +# all machines +set all_machs "cr16" - global SIMFLAGS_FOR_TARGET - # The cr16 linker sets the default LMA base to 0, and all the code - # expects the VMA when running, so use that when running the tests. - set SIMFLAGS_FOR_TARGET "--load-vma" +global SIMFLAGS_FOR_TARGET +# The cr16 linker sets the default LMA base to 0, and all the code +# expects the VMA when running, so use that when running the tests. +set SIMFLAGS_FOR_TARGET "--load-vma" - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp index 4d42667b0a4..40cdd965cfb 100644 --- a/sim/testsuite/cr16/misc.exp +++ b/sim/testsuite/cr16/misc.exp @@ -2,23 +2,19 @@ sim_init -if [istarget *] { - # all machines - set all_machs "cr16" +# all machines +set all_machs "cr16" - global SIMFLAGS_FOR_TARGET - # The cr16 linker sets the default LMA base to 0, and all the code - # expects the VMA when running, so use that when running the tests. - set SIMFLAGS_FOR_TARGET "--load-vma" +global SIMFLAGS_FOR_TARGET +# The cr16 linker sets the default LMA base to 0, and all the code +# expects the VMA when running, so use that when running the tests. +set SIMFLAGS_FOR_TARGET "--load-vma" - # The .ms suffix is for "miscellaneous .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# The .ms suffix is for "miscellaneous .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp index 6fed30acbd8..fe6b373ac43 100644 --- a/sim/testsuite/cris/asm/asm.exp +++ b/sim/testsuite/cris/asm/asm.exp @@ -17,31 +17,29 @@ sim_init -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. - - set combos {{"crisv10" "--march=v10 --no-mul-bug-abort"} - {"crisv32" "--march=v32"}} - - # We need to pass different assembler flags for each machine. - # Specifying it here rather than adding a specifier to each and every - # test-file is preferrable. - - foreach combo $combos { - set mach [lindex $combo 0] - set ASFLAGS_FOR_TARGET "[lindex $combo 1]" - - # The .ms suffix is for "miscellaneous .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $mach +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. + +set combos {{"crisv10" "--march=v10 --no-mul-bug-abort"} + {"crisv32" "--march=v32"}} + +# We need to pass different assembler flags for each machine. +# Specifying it here rather than adding a specifier to each and every +# test-file is preferrable. + +foreach combo $combos { + set mach [lindex $combo 0] + set ASFLAGS_FOR_TARGET "[lindex $combo 1]" + + # The .ms suffix is for "miscellaneous .s". + foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { + # If we're only testing specific files and this isn't one of them, + # skip it. + if ![runtest_file_p $runtests $src] { + continue } + + run_sim_test $src $mach } } diff --git a/sim/testsuite/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp index 97265a15db7..430c22e2606 100644 --- a/sim/testsuite/d10v/allinsn.exp +++ b/sim/testsuite/d10v/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "d10v" +# all machines +set all_machs "d10v" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/example-synacor/allinsn.exp b/sim/testsuite/example-synacor/allinsn.exp index 07401ced9bb..f751f3117e7 100644 --- a/sim/testsuite/example-synacor/allinsn.exp +++ b/sim/testsuite/example-synacor/allinsn.exp @@ -2,19 +2,16 @@ sim_init -if [istarget *] { - # All machines. - set all_machs "example" +# All machines. +set all_machs "example" - global LDFLAGS_FOR_TARGET - set LDFLAGS_FOR_TARGET "-Ttext=0" +global LDFLAGS_FOR_TARGET +set LDFLAGS_FOR_TARGET "-Ttext=0" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/allinsn-a-b.exp b/sim/testsuite/frv/allinsn-a-b.exp index c24cd42fb19..6831231e330 100644 --- a/sim/testsuite/frv/allinsn-a-b.exp +++ b/sim/testsuite/frv/allinsn-a-b.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[a-b\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-c.exp b/sim/testsuite/frv/allinsn-c.exp index e1672e8f273..2d82fb47544 100644 --- a/sim/testsuite/frv/allinsn-c.exp +++ b/sim/testsuite/frv/allinsn-c.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[c\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-d-h.exp b/sim/testsuite/frv/allinsn-d-h.exp index 8c29369035a..42645e1c658 100644 --- a/sim/testsuite/frv/allinsn-d-h.exp +++ b/sim/testsuite/frv/allinsn-d-h.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[d-h\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-i-l.exp b/sim/testsuite/frv/allinsn-i-l.exp index 10b8793ceee..faa07cde1ea 100644 --- a/sim/testsuite/frv/allinsn-i-l.exp +++ b/sim/testsuite/frv/allinsn-i-l.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[i-l\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-m.exp b/sim/testsuite/frv/allinsn-m.exp index e3733e05550..aba95077375 100644 --- a/sim/testsuite/frv/allinsn-m.exp +++ b/sim/testsuite/frv/allinsn-m.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[m\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-n.exp b/sim/testsuite/frv/allinsn-n.exp index e6c41b414f6..3b41fef3212 100644 --- a/sim/testsuite/frv/allinsn-n.exp +++ b/sim/testsuite/frv/allinsn-n.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[n\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-o-s.exp b/sim/testsuite/frv/allinsn-o-s.exp index 98906e81bc4..6e172fc38d0 100644 --- a/sim/testsuite/frv/allinsn-o-s.exp +++ b/sim/testsuite/frv/allinsn-o-s.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[o-s\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/allinsn-t-z.exp b/sim/testsuite/frv/allinsn-t-z.exp index 04b0e5709cb..52610c2ab8e 100644 --- a/sim/testsuite/frv/allinsn-t-z.exp +++ b/sim/testsuite/frv/allinsn-t-z.exp @@ -8,8 +8,7 @@ set cpu_option -mcpu # The .cgs suffix is for "cgen .s". foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[t-z\]*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. + # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $src] { continue } diff --git a/sim/testsuite/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp index 4f92f227d92..b4fa18630c5 100644 --- a/sim/testsuite/frv/fr400/allinsn.exp +++ b/sim/testsuite/frv/fr400/allinsn.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "fr400 fr405 fr450 fr550" - set cpu_option -mcpu +# all machines +set all_machs "fr400 fr405 fr450 fr550" +set cpu_option -mcpu - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/fr500/allinsn.exp b/sim/testsuite/frv/fr500/allinsn.exp index ec1309a2441..4e7360cb445 100644 --- a/sim/testsuite/frv/fr500/allinsn.exp +++ b/sim/testsuite/frv/fr500/allinsn.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "frv fr500 fr550" - set cpu_option -mcpu +# all machines +set all_machs "frv fr500 fr550" +set cpu_option -mcpu - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/fr550/allinsn.exp b/sim/testsuite/frv/fr550/allinsn.exp index 56df37d427d..6b4ce7774cd 100644 --- a/sim/testsuite/frv/fr550/allinsn.exp +++ b/sim/testsuite/frv/fr550/allinsn.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "fr550" - set cpu_option -mcpu +# all machines +set all_machs "fr550" +set cpu_option -mcpu - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/interrupts.exp b/sim/testsuite/frv/interrupts.exp index ec83de422ea..fe88591acf9 100644 --- a/sim/testsuite/frv/interrupts.exp +++ b/sim/testsuite/frv/interrupts.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "frv fr500 fr550 fr400" - set cpu_option -mcpu +# all machines +set all_machs "frv fr500 fr550 fr400" +set cpu_option -mcpu - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/interrupts/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/interrupts/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/misc.exp b/sim/testsuite/frv/misc.exp index 21877f96338..b5cacf80746 100644 --- a/sim/testsuite/frv/misc.exp +++ b/sim/testsuite/frv/misc.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "frv fr500 fr550 fr400 fr405 fr450" - set cpu_option -mcpu +# all machines +set all_machs "frv fr500 fr550 fr400 fr405 fr450" +set cpu_option -mcpu - # The .ms suffix is for "miscellaneous .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .ms suffix is for "miscellaneous .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/frv/parallel.exp b/sim/testsuite/frv/parallel.exp index 00bcccd66ef..5fe27087ef3 100644 --- a/sim/testsuite/frv/parallel.exp +++ b/sim/testsuite/frv/parallel.exp @@ -2,18 +2,15 @@ sim_init -if [istarget *] { - # all machines - set all_machs "frv fr500 fr550 fr400" - set cpu_option -mcpu +# all machines +set all_machs "frv fr500 fr550 fr400" +set cpu_option -mcpu - # The .pcgs suffix is for "parallel cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.pcgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .pcgs suffix is for "parallel cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.pcgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp index 260f13e1ceb..bd3a6bb10ac 100644 --- a/sim/testsuite/ft32/allinsn.exp +++ b/sim/testsuite/ft32/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "ft32" +# all machines +set all_machs "ft32" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp index f270661f021..4f0e6db91bf 100644 --- a/sim/testsuite/h8300/allinsn.exp +++ b/sim/testsuite/h8300/allinsn.exp @@ -2,16 +2,12 @@ sim_init -if {[istarget *]} { - set all_machs "h8300 h8300h h8300s h8sx" +set all_machs "h8300 h8300h h8300s h8sx" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp index 30a1c94ea61..554c6aedf5a 100644 --- a/sim/testsuite/iq2000/allinsn.exp +++ b/sim/testsuite/iq2000/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "iq2000" +# all machines +set all_machs "iq2000" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp index fb5d4d3471e..67c70ecadd1 100644 --- a/sim/testsuite/lm32/allinsn.exp +++ b/sim/testsuite/lm32/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "lm32" +# all machines +set all_machs "lm32" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp index c979514f5dd..4df54fb8c8f 100644 --- a/sim/testsuite/m32c/allinsn.exp +++ b/sim/testsuite/m32c/allinsn.exp @@ -3,16 +3,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "m32c" +# all machines +set all_machs "m32c" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp index c20fc86558b..fb8646f8ccc 100644 --- a/sim/testsuite/m32r/allinsn.exp +++ b/sim/testsuite/m32r/allinsn.exp @@ -2,19 +2,14 @@ sim_init -if [istarget *] { - # all machines - set all_machs "m32r" - - - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "m32r" + +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/m32r/misc.exp b/sim/testsuite/m32r/misc.exp index 2ca2c03018b..c5a0c7d4404 100644 --- a/sim/testsuite/m32r/misc.exp +++ b/sim/testsuite/m32r/misc.exp @@ -2,19 +2,14 @@ sim_init -if [istarget *] { - # all machines - set all_machs "m32r" - - - # The .ms suffix is for "miscellaneous .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +# all machines +set all_machs "m32r" + +# The .ms suffix is for "miscellaneous .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp index 09653a00c45..5a10cc5131c 100644 --- a/sim/testsuite/m68hc11/allinsn.exp +++ b/sim/testsuite/m68hc11/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "m68hc11" +# all machines +set all_machs "m68hc11" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp index 64747752a8e..3333fdc3aed 100644 --- a/sim/testsuite/mcore/allinsn.exp +++ b/sim/testsuite/mcore/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "mcore" +# all machines +set all_machs "mcore" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp index 3f582b033d3..97dc6ec4624 100644 --- a/sim/testsuite/microblaze/allinsn.exp +++ b/sim/testsuite/microblaze/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "microblaze" +# all machines +set all_machs "microblaze" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp index 3e5903ac7ba..96a1c150c6d 100644 --- a/sim/testsuite/mn10300/allinsn.exp +++ b/sim/testsuite/mn10300/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "mn10300" +# all machines +set all_machs "mn10300" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp index 3f2f0a7ac3f..30871685a20 100644 --- a/sim/testsuite/moxie/allinsn.exp +++ b/sim/testsuite/moxie/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "moxie" +# all machines +set all_machs "moxie" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp index 888afa918d8..ee56936cb90 100644 --- a/sim/testsuite/msp430/allinsn.exp +++ b/sim/testsuite/msp430/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "msp430" +# all machines +set all_machs "msp430" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp index 1b26e5b2019..15a7fd47c79 100644 --- a/sim/testsuite/or1k/alltests.exp +++ b/sim/testsuite/or1k/alltests.exp @@ -17,19 +17,14 @@ sim_init -if [istarget *] { - set all_machs "or1k" +set all_machs "or1k" - global LDFLAGS_FOR_TARGET - set LDFLAGS_FOR_TARGET "-T $srcdir/$subdir/or1k-test.ld" +global LDFLAGS_FOR_TARGET +set LDFLAGS_FOR_TARGET "-T $srcdir/$subdir/or1k-test.ld" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.S]] { - - if ![runtest_file_p $runtests $src] { - continue - } - - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.S]] { + if ![runtest_file_p $runtests $src] { + continue } - + run_sim_test $src $all_machs } diff --git a/sim/testsuite/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp index 9b98e22e728..465582f5637 100644 --- a/sim/testsuite/pru/allinsn.exp +++ b/sim/testsuite/pru/allinsn.exp @@ -20,16 +20,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "pru" +# all machines +set all_machs "pru" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/riscv/allinsn.exp b/sim/testsuite/riscv/allinsn.exp index db310c30ea5..972edf4d5ec 100644 --- a/sim/testsuite/riscv/allinsn.exp +++ b/sim/testsuite/riscv/allinsn.exp @@ -2,16 +2,13 @@ sim_init -if [istarget *] { - # all machines - set all_machs "riscv" +# all machines +set all_machs "riscv" - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } diff --git a/sim/testsuite/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp index 69d324ae91d..4eabdf2602c 100644 --- a/sim/testsuite/sh/allinsn.exp +++ b/sim/testsuite/sh/allinsn.exp @@ -14,8 +14,6 @@ foreach opt $board_variant_list { } } -if [istarget *] { - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { - run_sim_test $src $all_machs - } +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] { + run_sim_test $src $all_machs } diff --git a/sim/testsuite/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp index 1aa80249f9d..4cc461c30fd 100644 --- a/sim/testsuite/v850/allinsns.exp +++ b/sim/testsuite/v850/allinsns.exp @@ -2,23 +2,20 @@ sim_init -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. - set all_machs "v850e v850" +# 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. +set all_machs "v850e v850" - # gas doesn't support any '=' option for v850. - set cpu_option_sep "" - set cpu_option -m +# gas doesn't support any '=' option for v850. +set cpu_option_sep "" +set cpu_option -m - # The .cgs suffix is for "cgen .s". - foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { - # If we're only testing specific files and this isn't one of them, - # skip it. - if ![runtest_file_p $runtests $src] { - continue - } - run_sim_test $src $all_machs +# The .cgs suffix is for "cgen .s". +foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] { + # If we're only testing specific files and this isn't one of them, skip it. + if ![runtest_file_p $runtests $src] { + continue } + run_sim_test $src $all_machs } -- 2.30.2