From 638b73de32acaf7bef819d565721fe416c61c447 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 2 Nov 2023 02:58:19 +0100 Subject: [PATCH] Missing files --- MANIFEST.in | 2 ++ teshsuite/mc/CMakeLists.txt | 17 ++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index b6d6b978bb..adda74c968 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -676,6 +676,8 @@ include teshsuite/mc/dwarf-expression/dwarf-expression.cpp include teshsuite/mc/dwarf-expression/dwarf-expression.tesh include teshsuite/mc/dwarf/dwarf.cpp include teshsuite/mc/dwarf/dwarf.tesh +include teshsuite/mc/mcmini/barber_shop_ok.c +include teshsuite/mc/mcmini/barber_shop_ok.tesh include teshsuite/mc/mutex-handling/mutex-handling.cpp include teshsuite/mc/mutex-handling/mutex-handling.tesh include teshsuite/mc/mutex-handling/without-mutex-handling.tesh diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 833f2149fb..dd51f9a03f 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -36,10 +36,6 @@ set_target_properties(without-mutex-handling PROPERTIES COMPILE_FLAGS -DDISABLE_ set_target_properties(without-mutex-handling PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling) add_dependencies(tests-mc without-mutex-handling) -set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/random-bug-replay.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/without-mutex-handling.tesh PARENT_SCOPE) - ADD_TESH(mc-random-bug-replay --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug-replay.tesh) IF(SIMGRID_HAVE_MC) ADD_TESH(tesh-mc-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:none) @@ -80,14 +76,21 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux") # simple_mutex_with_threads_ok simple_semaphores_ok simple_semaphores_with_threads_ok simple_threads_ok ) - add_executable (mcmini-${x} EXCLUDE_FROM_ALL mcmini/${x}.c) + set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.c) + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh) + + add_executable (mcmini-${x} EXCLUDE_FROM_ALL mcmini/${x}.c) set_target_properties(mcmini-${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mcmini) target_link_libraries(mcmini-${x} PRIVATE Threads::Threads) add_dependencies(tests-mc mcmini-${x}) if(SIMGRID_HAVE_STATEFUL_MC) # Only needed to introspect the binary target_link_libraries(mc-mini-${x} PUBLIC "-Wl,-znorelro -Wl,-znoseparate-code") # TODO: convert to target_link_option once CMAKE_VERSION is >3.13 - endif() + endif() ADD_TESH_FACTORIES(mc-mini-${x} "^thread" --setenv libdir=${CMAKE_BINARY_DIR}/lib --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh) endforeach() -endif() \ No newline at end of file +endif() + +set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) +set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/random-bug-replay.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/without-mutex-handling.tesh PARENT_SCOPE) -- 2.20.1