Fix search paths for test "simdag-test-lua".

The test is still failing, though.

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 6e17a85..4855a4c 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -423,7 +423,7 @@ if(NOT enable_memcheck)
     ADD_TEST(lua-masterslave-bypass             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh)
     ADD_TEST(lua-msg-masterslave-console        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh)
     ADD_TEST(lua-chord                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh)
     ADD_TEST(lua-masterslave-bypass             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console master_slave_bypass.tesh)
     ADD_TEST(lua-msg-masterslave-console        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_console.tesh)
     ADD_TEST(lua-chord                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh)

-    ADD_TEST(simdag-test-lua                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag2_lua.tesh)
+    ADD_TEST(simdag-test-lua                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/simdag --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2_lua.tesh)

     set_tests_properties(lua-duplicated-globals         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-masterslave                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-mult-matrix                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-duplicated-globals         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-masterslave                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-mult-matrix                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")

diff --git a/examples/simdag/test_simdag2_lua.tesh b/examples/simdag/test_simdag2_lua.tesh
index d4b5560..c1a328b 100644 (file)
--- a/examples/simdag/test_simdag2_lua.tesh
+++ b/examples/simdag/test_simdag2_lua.tesh
@@ -2,6 +2,6 @@
 
 p Simple test of simdag. Environment described in lua
 
 
 p Simple test of simdag. Environment described in lua
 

-$ $SG_TEST_EXENV ./sd_test2 ${srcdir:=..lua/console}/platform.lua
+$ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/../lua/console/platform.lua

 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 > [9.811800] [sd_test/INFO] Simulation time: 9.811800
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 > [9.811800] [sd_test/INFO] Simulation time: 9.811800