From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 23 Oct 2020 12:00:24 +0000 (+0200)
Subject: Merge branch 'pikachuyann/simgrid-stoprofiles'
X-Git-Tag: v3.26~260
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387

Merge branch 'pikachuyann/simgrid-stoprofiles'
---

f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387
diff --cc src/kernel/resource/profile/Profile_test.cpp
index 4c0aff2eb4,7d7648efec..ec95c30977
--- a/src/kernel/resource/profile/Profile_test.cpp
+++ b/src/kernel/resource/profile/Profile_test.cpp
@@@ -63,8 -65,17 +65,16 @@@ static std::vector<simgrid::kernel::pro
    return res;
  }
  
+ static std::vector<simgrid::kernel::profile::StochasticDatedValue> trace2selist(const char* str)
+ {
+   simgrid::kernel::profile::Profile* trace = simgrid::kernel::profile::Profile::from_string("TheName", str, 0);
+   std::vector<simgrid::kernel::profile::StochasticDatedValue> stocevlist = trace->stochastic_event_list;
+   tmgr_finalize();
+   return stocevlist;
+ }
+ 
  TEST_CASE("kernel::profile: Resource profiles, defining the external load", "kernel::profile")
  {
 -
    SECTION("No event, no loop")
    {
      std::vector<simgrid::kernel::profile::DatedValue> got = trace2vector("");