switch off tests that are flaky under simulation

These are currently BREAKPOINT_002 and SCHED0021. The corresponding issues #43 and #42 remain open, and when resolved positively, these tests should be enabled again for simulation runs. Signed-off-by: Gerwin Klein <[email protected]>
seL4 · Aug 21, 2021 · ad4695f · ad4695f
1 parent 2959436
commit ad4695f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <autoconf.h>
+#include <sel4test-driver/gen_config.h>
 
 #ifdef CONFIG_HARDWARE_DEBUG_API
 
@@ -264,7 +265,8 @@ 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
@@ -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
@@ -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()