From: Augustin Degomme <adegomme@gmail.com>
Date: Fri, 20 May 2022 08:24:24 +0000 (+0000)
Subject: Merge branch 'dev-add_comm_fault_scenario2' into 'master'
X-Git-Tag: v3.32~225
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/341b942554f9455d9de29c44ff871403323e5d6e?hp=70255c4f012f1226f635888bf94a4bfdad453046

Merge branch 'dev-add_comm_fault_scenario2' into 'master'

Run all comm fault scenarios now that other MRs have been accepted

See merge request simgrid/simgrid!104
---

diff --git a/teshsuite/s4u/comm-fault-scenarios/comm-fault-scenarios.cpp b/teshsuite/s4u/comm-fault-scenarios/comm-fault-scenarios.cpp
index 2e4251c4a0..cec1e2a33f 100644
--- a/teshsuite/s4u/comm-fault-scenarios/comm-fault-scenarios.cpp
+++ b/teshsuite/s4u/comm-fault-scenarios/comm-fault-scenarios.cpp
@@ -216,7 +216,7 @@ public:
   void operator()()
   {
     run_++;
-    XBT_DEBUG("Host %i starts run %i and scenario %lu.", id_, run_, scenario_);
+    XBT_DEBUG("Host %i starts run %i and scenario %zu.", id_, run_, scenario_);
     while (scenario_ < ctx_.scenarios.size()) {
       const Scenario& s = ctx_.scenarios[scenario_];
       scenario_++;
@@ -346,7 +346,7 @@ public:
   void operator()()
   {
     run_++;
-    XBT_DEBUG("Host %i starts run %i and scenario %lu.", id_, run_, scenario_);
+    XBT_DEBUG("Host %i starts run %i and scenario %zu.", id_, run_, scenario_);
     mbox_eager->set_receiver(sg4::Actor::self());
     while (scenario_ < ctx_.scenarios.size()) {
       const Scenario& s = ctx_.scenarios[scenario_];
@@ -707,4 +707,4 @@ double build_scenarios(ScenarioContext& ctx)
 
   XBT_INFO("Will execute %i active scenarios out of %i.", ctx.active, ctx.index);
   return ctx.start_time + 1;
-}
\ No newline at end of file
+}