Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Activate the stdobject test now that it works
authorMartin Quinson <martin.quinson@ens-rennes.fr>
Mon, 27 Mar 2023 07:00:50 +0000 (09:00 +0200)
committerMartin Quinson <martin.quinson@ens-rennes.fr>
Mon, 27 Mar 2023 07:00:50 +0000 (09:00 +0200)
examples/sthread/CMakeLists.txt
examples/sthread/stdobject/stdobject.tesh

index 27b78a2..3159ccc 100644 (file)
@@ -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)
index 37d6d25..111458a 100644 (file)
@@ -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...