New way to give LUA_CPATH.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8734 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index f5cfe91..9dab34b 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -212,10 +212,10 @@ endif(HAVE_GTNETS)
 
 # Lua examples
 if(HAVE_LUA)
-ADD_TEST(lua-masterslave               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)
-ADD_TEST(lua-mult_matrix               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)
-ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh)
-ADD_TEST(msg-masterslave-console       ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)
+ADD_TEST(lua-masterslave               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
+ADD_TEST(lua-mult_matrix               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
+ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
+ADD_TEST(lua-msg-masterslave-console   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
 endif(HAVE_LUA)
 
 # Ruby examples

diff --git a/examples/lua/master_slave.tesh b/examples/lua/master_slave.tesh
index 3707638..75cbf91 100644 (file)
--- a/examples/lua/master_slave.tesh
+++ b/examples/lua/master_slave.tesh
@@ -2,9 +2,6 @@
 
 # Later modify the commande and specify the platform and deployment path
 
-# The setenv is mandatory until the make install only
-! setenv LUA_CPATH=../../lib/lua/5.1/?.so;
-
 $ lua master_slave.lua
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Hello from lua, I'm the master
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 20

diff --git a/examples/lua/master_slave_bypass.tesh b/examples/lua/master_slave_bypass.tesh
index f9473ef..14b6f6d 100644 (file)
--- a/examples/lua/master_slave_bypass.tesh
+++ b/examples/lua/master_slave_bypass.tesh
@@ -1,8 +1,5 @@
 # compile the master_slave_bypass example
 
-# The setenv is mandatory until the make install only
-! setenv LUA_CPATH=../../lib/lua/5.1/?.so;
-
 $ lua master_slave.lua --log=surf_parse.thres:critical
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Hello from lua, I'm the master
 > [Tremblay:Master:(1) 0.000000] [lua/INFO] Got 20

diff --git a/examples/lua/mult_matrix.tesh b/examples/lua/mult_matrix.tesh
index 8f10b12..24fd093 100644 (file)
--- a/examples/lua/mult_matrix.tesh
+++ b/examples/lua/mult_matrix.tesh
@@ -2,9 +2,6 @@
 
 # Later modify the commande and specify the platform and deployment path
 
-# The setenv is mandatory until the make install only
-! setenv LUA_CPATH=../../lib/lua/5.1/?.so;
-
 $ lua mult_matrix.lua
 > [Inmos:Sender:(1) 0.000000] [lua/INFO] Hello From Sender
 > [Inmos:Sender:(1) 0.000000] [lua/INFO] Argc=4 (should be 4)

diff --git a/examples/msg/masterslave/masterslave_console.tesh b/examples/msg/masterslave/masterslave_console.tesh
index 0b9c964..fbd8ab2 100644 (file)
--- a/examples/msg/masterslave/masterslave_console.tesh
+++ b/examples/msg/masterslave/masterslave_console.tesh
@@ -1,8 +1,5 @@
 #! ./tesh
 
-# The setenv is mandatory until the make install only
-! setenv LUA_CPATH=../../../lib/lua/5.1/?.so;
-
 $ $SG_TEST_EXENV ./masterslave_console platform_script.lua --log=surf_parse.thres:critical
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 4 slaves and 20 tasks to process
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0"