From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 14 Nov 2021 18:43:46 +0000 (-0500)
Subject: sim: bfin: fix mach/xfail usage in tests
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b2ec4e46fb726a7616a07e67c4270f48c8c546e;p=binutils-gdb.git

sim: bfin: fix mach/xfail usage in tests

Set the mach to the right value all the time, and update xfail to
say the test fails on all targets.  WIth multitarget testing, the
idea of target here doesn't make much sense.
---

diff --git a/sim/testsuite/bfin/se_all32bitopcodes.S b/sim/testsuite/bfin/se_all32bitopcodes.S
index 6ffe6d1c5cf..0de8e0de961 100644
--- a/sim/testsuite/bfin/se_all32bitopcodes.S
+++ b/sim/testsuite/bfin/se_all32bitopcodes.S
@@ -11,9 +11,9 @@
 # Don't want to enable for normal `make check` as it takes way too long in
 # the sim -- executes over 3 billion insns, and even at 10 MIPS, that's 10+
 # minutes.  Useful for directed testing, but that's about it.
-# mach: none
+# mach: bfin
 # sim: --environment operating
-# xfail: too many invalid insns are decoded as valid
+# xfail: "too many invalid insns are decoded as valid" *-*
 
 #include "test.h"
 
diff --git a/sim/testsuite/bfin/se_all64bitg0opcodes.S b/sim/testsuite/bfin/se_all64bitg0opcodes.S
index 516583bb2d3..72da76b9f30 100644
--- a/sim/testsuite/bfin/se_all64bitg0opcodes.S
+++ b/sim/testsuite/bfin/se_all64bitg0opcodes.S
@@ -10,9 +10,9 @@
 # Don't want to enable for normal `make check` as it takes way too long in
 # the sim -- executes over 3 billion insns, and even at 10 MIPS, that's 10+
 # minutes.  Useful for directed testing, but that's about it.
-# mach: none
+# mach: bfin
 # sim: --environment operating
-# xfail: too many invalid insns are decoded as valid
+# xfail: "too many invalid insns are decoded as valid" *-*
 
 #include "test.h"
 	.include "testutils.inc"
diff --git a/sim/testsuite/bfin/se_illegalcombination.S b/sim/testsuite/bfin/se_illegalcombination.S
index 0fe5f27533f..85633d1621a 100644
--- a/sim/testsuite/bfin/se_illegalcombination.S
+++ b/sim/testsuite/bfin/se_illegalcombination.S
@@ -2,7 +2,7 @@
 // Description: Multi-issue Illegal Combinations
 # mach: bfin
 # sim: --environment operating
-# xfail: "missing a few checks; hardware doesnt seem to match PRM?" bfin-*
+# xfail: "missing a few checks; hardware doesnt seem to match PRM?" *-*
 
 #include "test.h"
 .include "testutils.inc"
diff --git a/sim/testsuite/bfin/se_undefinedinstruction3.S b/sim/testsuite/bfin/se_undefinedinstruction3.S
index 0acfb8888cb..3db07a8641b 100644
--- a/sim/testsuite/bfin/se_undefinedinstruction3.S
+++ b/sim/testsuite/bfin/se_undefinedinstruction3.S
@@ -2,7 +2,7 @@
 // Description: 32 bit special cases Undefined Instructions in Supervisor Mode
 # mach: bfin
 # sim: --environment operating
-# xfail: "missing checks in A0/A1 macfunc" bfin-*
+# xfail: "missing checks in A0/A1 macfunc" *-*
 
 #include "test.h"
 .include "testutils.inc"