Merge remote-tracking branch 'github/master'

diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
index d9dbfc9..cd933ff 100644 (file)
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
@@ -6,6 +6,7 @@ foreach(example actor-create actor-daemon actor-join actor-kill actor-migrate ac
   if(enable_python)
     ADD_TESH(python-${example} --setenv srcdir=${CMAKE_CURRENT_SOURCE_DIR}/${example}
                                --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
+                               --setenv pythoncmd=${PYTHON_EXECUTABLE}
                               --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
                               --setenv PYTHONPATH=${CMAKE_BINARY_DIR}/lib
                               --cd ${CMAKE_CURRENT_SOURCE_DIR}/${example}

diff --git a/examples/python/actor-create/actor-create.tesh b/examples/python/actor-create/actor-create.tesh
index 17f7c8b..c81e7c6 100644 (file)
--- a/examples/python/actor-create/actor-create.tesh
+++ b/examples/python/actor-create/actor-create.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-create.py
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-create.py
 > [Tremblay:sender1:(2) 0.000000] [python/INFO] Hello s4u, I have something to send
 > [Jupiter:sender2:(3) 0.000000] [python/INFO] Hello s4u, I have something to send
 > [Fafard:sender:(4) 0.000000] [python/INFO] Hello s4u, I have something to send

diff --git a/examples/python/actor-daemon/actor-daemon.tesh b/examples/python/actor-daemon/actor-daemon.tesh
index 1513f14..a687d3c 100644 (file)
--- a/examples/python/actor-daemon/actor-daemon.tesh
+++ b/examples/python/actor-daemon/actor-daemon.tesh
@@ -2,7 +2,7 @@
 
 p Testing the process daemonization feature
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-daemon.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-daemon.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin).
 > [  0.000000] (daemon@Tremblay) Hello from the infinite loop
 > [  3.000000] (daemon@Tremblay) Hello from the infinite loop

diff --git a/examples/python/actor-join/actor-join.tesh b/examples/python/actor-join/actor-join.tesh
index f9c8ffc..824ec05 100644 (file)
--- a/examples/python/actor-join/actor-join.tesh
+++ b/examples/python/actor-join/actor-join.tesh
@@ -1,4 +1,4 @@
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-join.py ${platfdir}/small_platform.xml
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-join.py ${platfdir}/small_platform.xml
 > [Tremblay:master:(1) 0.000000] [python/INFO] Start sleeper
 > [Tremblay:sleeper from master:(2) 0.000000] [python/INFO] Sleeper started
 > [Tremblay:master:(1) 0.000000] [python/INFO] Join the sleeper (timeout 2)

diff --git a/examples/python/actor-kill/actor-kill.tesh b/examples/python/actor-kill/actor-kill.tesh
index 125d916..7177913 100644 (file)
--- a/examples/python/actor-kill/actor-kill.tesh
+++ b/examples/python/actor-kill/actor-kill.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-kill.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-kill.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (killer@Tremblay) Hello!
 > [  0.000000] (victim A@Fafard) Hello!
 > [  0.000000] (victim A@Fafard) Suspending myself

diff --git a/examples/python/actor-lifetime/actor-lifetime.tesh b/examples/python/actor-lifetime/actor-lifetime.tesh
index c5b8121..906d466 100644 (file)
--- a/examples/python/actor-lifetime/actor-lifetime.tesh
+++ b/examples/python/actor-lifetime/actor-lifetime.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-lifetime.py ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-lifetime.py ${platfdir}/cluster_backbone.xml actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep.
 > [  0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep.

diff --git a/examples/python/actor-migrate/actor-migrate.tesh b/examples/python/actor-migrate/actor-migrate.tesh
index 5c3ac05..d773313 100644 (file)
--- a/examples/python/actor-migrate/actor-migrate.tesh
+++ b/examples/python/actor-migrate/actor-migrate.tesh
@@ -2,7 +2,7 @@
 
 p Testing the actor migration feature 
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-migrate.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-migrate.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 > [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit

diff --git a/examples/python/actor-suspend/actor-suspend.tesh b/examples/python/actor-suspend/actor-suspend.tesh
index 226b54b..fee3d52 100644 (file)
--- a/examples/python/actor-suspend/actor-suspend.tesh
+++ b/examples/python/actor-suspend/actor-suspend.tesh
@@ -3,7 +3,7 @@
 p Testing the suspend/resume feature of SimGrid
 
 ! output sort 19
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-suspend.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/actor-suspend.py ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (dream_master@Boivin) Let's create a lazy guy.
 > [  0.000000] (Lazy@Boivin) Nobody's watching me ? Let's go to sleep.
 > [  0.000000] (dream_master@Boivin) Let's wait a little bit...

diff --git a/examples/python/actor-yield/actor-yield.tesh b/examples/python/actor-yield/actor-yield.tesh
index 33b6c3f..209b2eb 100644 (file)
--- a/examples/python/actor-yield/actor-yield.tesh
+++ b/examples/python/actor-yield/actor-yield.tesh
@@ -1,5 +1,5 @@
 #!/usr/bin/env tesh
 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../s4u/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir:=.}/actor-yield.py ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/../../s4u/actor-yield/s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now!
 > [  0.000000] (2:yielder@Ruby) I yielded 15 times. Goodbye now!

diff --git a/examples/python/exec-basic/exec-basic.tesh b/examples/python/exec-basic/exec-basic.tesh
index fffc31b..f0cff81 100644 (file)
--- a/examples/python/exec-basic/exec-basic.tesh
+++ b/examples/python/exec-basic/exec-basic.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
 p Start remote processes 
-$ python3 ${PYTHON_TOOL_OPTIONS:=} ${srcdir}/exec-basic.py ${platfdir}/small_platform.xml 
+$ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${srcdir}/exec-basic.py ${platfdir}/small_platform.xml 
 > [Tremblay:privileged:(2) 0.001500] [python/INFO] Done.
 > [Tremblay:executor:(1) 0.002000] [python/INFO] Done.