Skip to content

Commit

Permalink
switch off tests that are flaky under simulation
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
lsf37 committed Aug 23, 2021
1 parent 2959436 commit df1f1df
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions apps/sel4test-driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion apps/sel4test-tests/src/tests/breakpoints.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <autoconf.h>
#include <sel4test-driver/gen_config.h>

#ifdef CONFIG_HARDWARE_DEBUG_API

Expand Down Expand Up @@ -263,8 +264,11 @@ test_debug_set_data_breakpoint(struct env *env)
}
return sel4test_get_result();
}
/* This test is flaky under simulation. See also #43 */
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)
Expand Down
4 changes: 3 additions & 1 deletion apps/sel4test-tests/src/tests/scheduler.c
Original file line number Diff line number Diff line change
Expand Up @@ -1624,8 +1624,10 @@ static int test_simple_preempt(struct env *env)

return sel4test_get_result();
}
/* This test is flaky under simulation. Probably a race condition that only
comes out under simulator timing conditions. See also #42 */
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)
{
Expand Down
2 changes: 2 additions & 0 deletions settings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit df1f1df

Please sign in to comment.