From: mlaurent <mathieu.laurent@ens-rennes.fr>
Date: Tue, 6 Jun 2023 10:05:29 +0000 (+0200)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid
X-Git-Tag: v3.34~41^2~9
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dc6726419e36dd2853c7773e0a8fc177091e79e0?hp=cd5185ae774cc99650b6cae2dca17b6062accea3

Merge branch 'master' of https://framagit.org/simgrid/simgrid
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efb19500f7..89000b0400 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,7 @@ pip:
 pages:
   stage: deploy
   script:
-  - apt install python3-breathe python3-sphinx python3-sphinx-rtd-theme python3-sphinx-copybutton python3-sphinx-tabs
+  - apt install -y python3-breathe python3-sphinx python3-sphinx-rtd-theme python3-sphinx-copybutton python3-sphinx-tabs
  # - pip3 install --requirement docs/requirements.txt # Forbidden in Debian:12
   - cd docs
   - LC_ALL=C.UTF-8 ./Build.sh
diff --git a/src/mc/explo/odpor/odpor_forward.hpp b/src/mc/explo/odpor/odpor_forward.hpp
index 946e3f4f49..8fba97c666 100644
--- a/src/mc/explo/odpor/odpor_forward.hpp
+++ b/src/mc/explo/odpor/odpor_forward.hpp
@@ -22,7 +22,7 @@ using PartialExecution = std::list<std::shared_ptr<Transition>>;
 
 class Event;
 class Execution;
-class ReversibleRaceCalculator;
+struct ReversibleRaceCalculator;
 class WakeupTree;
 class WakeupTreeNode;
 struct WakeupTreeIterator;
diff --git a/src/mc/explo/odpor/odpor_tests_private.hpp b/src/mc/explo/odpor/odpor_tests_private.hpp
index 0a29f7d047..cd76ba3ea3 100644
--- a/src/mc/explo/odpor/odpor_tests_private.hpp
+++ b/src/mc/explo/odpor/odpor_tests_private.hpp
@@ -21,7 +21,6 @@ private:
   const int value;
 
 public:
-  DependentIfSameValueAction() = default;
   DependentIfSameValueAction(Type type, aid_t issuer, int value, int times_considered = 0)
       : Transition(type, issuer, times_considered), value(value)
   {
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 09491e4cac..9a39066a42 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -128,22 +128,24 @@ set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
                 src/xbt/random_test.cpp
                 src/xbt/xbt_str_test.cpp
                 src/xbt/utils/iter/subsets_tests.cpp
-                src/kernel/lmm/maxmin_test.cpp)
-
-set(MC_UNIT_TESTS src/mc/sosp/Snapshot_test.cpp 
-                  src/mc/sosp/PageStore_test.cpp
-                  src/mc/explo/odpor/ClockVector_test.cpp
-                  src/mc/explo/odpor/Execution_test.cpp
-                  src/mc/explo/odpor/WakeupTree_test.cpp
-                  src/mc/explo/udpor/EventSet_test.cpp
-                  src/mc/explo/udpor/Unfolding_test.cpp
-                  src/mc/explo/udpor/UnfoldingEvent_test.cpp
-                  src/mc/explo/udpor/History_test.cpp
-                  src/mc/explo/udpor/Configuration_test.cpp)
+                src/kernel/lmm/maxmin_test.cpp
+
+                src/mc/explo/odpor/ClockVector_test.cpp
+                src/mc/explo/odpor/Execution_test.cpp
+                src/mc/explo/odpor/WakeupTree_test.cpp)
+
+set(STATEFUL_MC_UNIT_TESTS src/mc/sosp/Snapshot_test.cpp
+                           src/mc/sosp/PageStore_test.cpp
+                           src/mc/explo/udpor/Unfolding_test.cpp
+                           src/mc/explo/udpor/UnfoldingEvent_test.cpp
+
+                           src/mc/explo/udpor/EventSet_test.cpp
+                           src/mc/explo/udpor/History_test.cpp
+                           src/mc/explo/udpor/Configuration_test.cpp)
 if (SIMGRID_HAVE_STATEFUL_MC)
-  set(UNIT_TESTS ${UNIT_TESTS} ${MC_UNIT_TESTS})
+  set(UNIT_TESTS ${UNIT_TESTS} ${STATEFUL_MC_UNIT_TESTS})
 else()
-  set(EXTRA_DIST ${EXTRA_DIST} ${MC_UNIT_TESTS})
+  set(EXTRA_DIST ${EXTRA_DIST} ${STATEFUL_MC_UNIT_TESTS})
 endif()
 if (SIMGRID_HAVE_EIGEN3)
   set(UNIT_TESTS ${UNIT_TESTS} src/kernel/lmm/bmf_test.cpp)