From 6f62dbfb12f586691ef57878b7680cc2b02d81c4 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Mon, 14 Feb 2022 23:50:55 +0100 Subject: [PATCH] sim/testsuite/cris: As applicable, require simoption --cris-900000xx Apply the new run_sim_test option "require" as in "#require simoption --cris-900000xx" for all tests using that option. This allows a clean test-suite-run for a build with --disable-sim-hardware, where that option is not supported, by skipping those tests as "untested". sim/testsuite/cris: * asm/io1.ms, asm/io2.ms, asm/io3.ms, asm/io6.ms, asm/io7.ms: Call "#require: simoption --cris-900000xx". --- sim/testsuite/cris/asm/io1.ms | 1 + sim/testsuite/cris/asm/io2.ms | 1 + sim/testsuite/cris/asm/io3.ms | 1 + sim/testsuite/cris/asm/io6.ms | 1 + sim/testsuite/cris/asm/io7.ms | 1 + 5 files changed, 5 insertions(+) diff --git a/sim/testsuite/cris/asm/io1.ms b/sim/testsuite/cris/asm/io1.ms index 3d252ae1f93..3b830f02327 100644 --- a/sim/testsuite/cris/asm/io1.ms +++ b/sim/testsuite/cris/asm/io1.ms @@ -1,4 +1,5 @@ # mach: crisv32 +# requires: simoption --cris-900000xx # sim: --cris-900000xx --memory-region 0x90000000,0x10 # xerror: # output: /core/cris_900000xx: memory map 0:0x90000000..0x900000ff (256 bytes) overlaps 0:0x90000000..0x9000000f (16 bytes)\nQuit Simulator\n diff --git a/sim/testsuite/cris/asm/io2.ms b/sim/testsuite/cris/asm/io2.ms index f6341d3739d..ce026c5daee 100644 --- a/sim/testsuite/cris/asm/io2.ms +++ b/sim/testsuite/cris/asm/io2.ms @@ -1,4 +1,5 @@ # mach: crisv32 +# requires: simoption --cris-900000xx # sim: --cris-900000xx # xerror: # output: b1e\n diff --git a/sim/testsuite/cris/asm/io3.ms b/sim/testsuite/cris/asm/io3.ms index 664dc61d267..d0760190737 100644 --- a/sim/testsuite/cris/asm/io3.ms +++ b/sim/testsuite/cris/asm/io3.ms @@ -1,4 +1,5 @@ # mach: crisv32 +# requires: simoption --cris-900000xx # sim: --cris-900000xx # output: ce11d0c\n diff --git a/sim/testsuite/cris/asm/io6.ms b/sim/testsuite/cris/asm/io6.ms index 3af3536265e..6ddeee1733e 100644 --- a/sim/testsuite/cris/asm/io6.ms +++ b/sim/testsuite/cris/asm/io6.ms @@ -1,5 +1,6 @@ # mach: crisv32 # ld: --section-start=.text=0 +# requires: simoption --cris-900000xx # sim: --cris-900000xx # xerror: # output: b1e\n diff --git a/sim/testsuite/cris/asm/io7.ms b/sim/testsuite/cris/asm/io7.ms index 84488e9452e..26261971b95 100644 --- a/sim/testsuite/cris/asm/io7.ms +++ b/sim/testsuite/cris/asm/io7.ms @@ -1,5 +1,6 @@ # mach: crisv32 # ld: --section-start=.text=0 +# requires: simoption --cris-900000xx # sim: --cris-900000xx # xerror: # output: ce11d0c\n -- 2.30.2