Fix various build errors

- clang complains about unused private fields
- stateful MC declares link option to the wrong binary name
- sthread displays a full path that needs to be hidden in tesh

diff --git a/src/mc/transition/TransitionActor.hpp b/src/mc/transition/TransitionActor.hpp
index f86df61..34df441 100644 (file)
--- a/src/mc/transition/TransitionActor.hpp
+++ b/src/mc/transition/TransitionActor.hpp
@@ -30,8 +30,6 @@ public:
 };
 
 class ActorSleepTransition : public Transition {
-  bool timeout_;
-  aid_t target_;
 
 public:
   ActorSleepTransition(aid_t issuer, int times_considered, std::stringstream& stream);

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index dd51f9a..8568c37 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -84,7 +84,7 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux")
     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
+      target_link_libraries(mcmini-${x} PUBLIC "-Wl,-znorelro -Wl,-znoseparate-code") # TODO: convert to target_link_option once CMAKE_VERSION is >3.13
     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)

diff --git a/teshsuite/mc/mcmini/barber_shop_ok.tesh b/teshsuite/mc/mcmini/barber_shop_ok.tesh
index c4b9d14..965c432 100644 (file)
--- a/teshsuite/mc/mcmini/barber_shop_ok.tesh
+++ b/teshsuite/mc/mcmini/barber_shop_ok.tesh
@@ -2,7 +2,7 @@
 ! ignore .*LD_PRELOAD.*
 
 $ $VALGRIND_NO_TRACE_CHILDREN ${bindir:=.}/../../bin/simgrid-mc --cfg=model-check/setenv:LD_PRELOAD=${libdir:=.}/libsgmalloc.so:${libdir:=.}/libsthread.so ${bindir:=.}/mcmini/mcmini-barber_shop_ok 3 2 0 0
-> sthread is intercepting the execution of /home/mquinson/Code/simgrid/build/default/teshsuite/mc/mcmini/mcmini-barber_shop_ok
+> sthread is intercepting the execution of teshsuite/mc/mcmini/mcmini-barber_shop_ok
 > 
 > SleepBarber.c
 > 

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index a0e96d5..9a4f924 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -594,6 +594,7 @@ def main():
             re.compile(r"For details see http://code\.google\.com/p/address-sanitizer/issues/detail\?id=189"),
             re.compile(r"For details see https://github\.com/google/sanitizers/issues/189"),
             re.compile(r"Python runtime initialized with LC_CTYPE=C .*"),
+            re.compile(r"sthread is intercepting the execution of \.*"),
             # Seen on CircleCI
             re.compile(r"cmake: /usr/local/lib/libcurl\.so\.4: no version information available \(required by cmake\)"),
             re.compile(