From d06b2ba9fea526b56374ef8c52f1c1d702415583 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 27 Mar 2023 09:00:50 +0200 Subject: [PATCH] Activate the stdobject test now that it works --- examples/sthread/CMakeLists.txt | 2 +- examples/sthread/stdobject/stdobject.tesh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sthread/CMakeLists.txt b/examples/sthread/CMakeLists.txt index 27b78a2317..3159ccce2e 100644 --- a/examples/sthread/CMakeLists.txt +++ b/examples/sthread/CMakeLists.txt @@ -65,7 +65,7 @@ foreach(example set_target_properties(${example} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${example}) add_dependencies(tests-mc ${example}) - #ADD_TESH_FACTORIES(sthread-mc-${example} "^thread" --setenv libdir=${CMAKE_BINARY_DIR}/lib --cd ${CMAKE_BINARY_DIR}/examples/sthread/${example} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh) + ADD_TESH_FACTORIES(sthread-mc-${example} "^thread" --setenv libdir=${CMAKE_BINARY_DIR}/lib --cd ${CMAKE_BINARY_DIR}/examples/sthread/${example} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh) endif() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${example}/${example}.tesh) diff --git a/examples/sthread/stdobject/stdobject.tesh b/examples/sthread/stdobject/stdobject.tesh index 37d6d250d7..111458a00a 100644 --- a/examples/sthread/stdobject/stdobject.tesh +++ b/examples/sthread/stdobject/stdobject.tesh @@ -4,7 +4,7 @@ # We ignore the LD_PRELOAD lines from the expected output because they contain the build path ! ignore .*LD_PRELOAD.* -$ ${bindir:=.}/../../../bin/simgrid-mc --cfg=model-check/sleep-set:true --cfg=model-check/setenv:LD_PRELOAD=${libdir:=.}/libsgmalloc.so:${libdir:=.}/libsthread.so ${bindir:=.}/stdobject "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" --log=no_loc +$ ${bindir:=.}/../../../bin/simgrid-mc --cfg=model-check/sleep-set:true --cfg=model-check/setenv:LD_PRELOAD=${libdir:=.}/libsthread.so ${bindir:=.}/stdobject "--log=root.fmt:[%11.6r]%e(%a@%h)%e%m%n" --log=no_loc > [ 0.000000] (maestro@) Configuration change: Set 'model-check/sleep-set' to 'true' > [ 0.000000] (maestro@) Starting the simulation. > starting two helpers... -- 2.20.1