From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 4 Dec 2017 22:23:14 +0000 (+0100)
Subject: Fix run of ns3 examples.
X-Git-Tag: v3.18~159
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/09a4b38584bf148c8e8feb59b3c925496bab22c3

Fix run of ns3 examples.
---

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index e3e4e9b0f6..d0764e1d96 100644
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -116,5 +116,9 @@ ADD_TESH_FACTORIES(app-masterworker-vivaldi     "thread;ucontext;raw;boost"
 						${CMAKE_HOME_DIRECTORY}/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh)
 
 if(SIMGRID_HAVE_NS3)
-  ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/network-ns3/network-ns3.tesh)
+  ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost"
+                                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg
+                                      --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg
+                                      --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
+                                      ${CMAKE_HOME_DIRECTORY}/examples/msg/network-ns3/network-ns3.tesh)
 endif()
diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh
index 78ab94b554..2605818714 100644
--- a/examples/msg/network-ns3/network-ns3.tesh
+++ b/examples/msg/network-ns3/network-ns3.tesh
@@ -5,8 +5,7 @@ p We just want to check that the NS3 bindings of SimGrid are working correctly,
 
 p 3hosts 2links
 
-$ ${bindir:=.}/network-ns3/network-ns3
-${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
+$ ${bindir:=.}/network-ns3/network-ns3 ${platfdir}/small_platform_one_link_routes.xml ${srcdir}/network-ns3/3hosts_2links_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n"
 > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [Jupiter:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from Tremblay to Jupiter