diff --git a/apps/sel4test-driver/CMakeLists.txt b/apps/sel4test-driver/CMakeLists.txt index b5003b13..4b2b9386 100644 --- a/apps/sel4test-driver/CMakeLists.txt +++ b/apps/sel4test-driver/CMakeLists.txt @@ -12,6 +12,8 @@ set(configure_string "") config_option(Sel4testHaveTimer HAVE_TIMER "Enable tests that require a timer driver" DEFAULT ON) +config_option(Sel4testSimulation SIMULATION "Disable tests not suitable for simulation" DEFAULT OFF) + config_option( Sel4testHaveCache HAVE_CACHE diff --git a/apps/sel4test-tests/src/tests/breakpoints.c b/apps/sel4test-tests/src/tests/breakpoints.c index 5c53ea6e..5ecebaf8 100644 --- a/apps/sel4test-tests/src/tests/breakpoints.c +++ b/apps/sel4test-tests/src/tests/breakpoints.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ #include +#include #ifdef CONFIG_HARDWARE_DEBUG_API @@ -264,7 +265,9 @@ test_debug_set_data_breakpoint(struct env *env) return sel4test_get_result(); } DEFINE_TEST(BREAKPOINT_002, "Attempt to set and trigger a data breakpoint", - test_debug_set_data_breakpoint, config_set(CONFIG_HARDWARE_DEBUG_API)) + test_debug_set_data_breakpoint, + config_set(CONFIG_HARDWARE_DEBUG_API) && + !config_set(CONFIG_SIMULATION)) static int test_debug_get_instruction_breakpoint(struct env *env) diff --git a/apps/sel4test-tests/src/tests/scheduler.c b/apps/sel4test-tests/src/tests/scheduler.c index 4c39c3dd..79e41dd1 100644 --- a/apps/sel4test-tests/src/tests/scheduler.c +++ b/apps/sel4test-tests/src/tests/scheduler.c @@ -1625,7 +1625,7 @@ static int test_simple_preempt(struct env *env) return sel4test_get_result(); } DEFINE_TEST(SCHED0021, "Test for pre-emption during running of many threads with equal prio", test_simple_preempt, - true); + !config_set(CONFIG_SIMULATION)); int sched0022_to_fn(struct env *env, helper_thread_t *thread, seL4_CPtr ep) { diff --git a/settings.cmake b/settings.cmake index 896efb12..f64b1e72 100644 --- a/settings.cmake +++ b/settings.cmake @@ -63,8 +63,10 @@ if(NOT Sel4testAllowSettingsOverride) # sel4test specific config settings. if(SIMULATION) + set(Sel4testSimulation ON CACHE BOOL "" FORCE) set(Sel4testHaveCache OFF CACHE BOOL "" FORCE) else() + set(Sel4testSimulation OFF CACHE BOOL "" FORCE) set(Sel4testHaveCache ON CACHE BOOL "" FORCE) endif()