From 822aac9cc93997864643a5c61fd6cbc3386e5931 Mon Sep 17 00:00:00 2001 From: suter Date: Fri, 22 Jun 2012 15:37:22 +0200 Subject: [PATCH] add a (currently) broken test that tries to create the environment by loading some lua script --- buildtools/Cmake/AddTests.cmake | 2 ++ examples/simdag/sd_test2.c | 9 ++++++++- examples/simdag/test_simdag2_lua.tesh | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 examples/simdag/test_simdag2_lua.tesh diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 0d1bf41646..860f5d7914 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -419,12 +419,14 @@ ADD_TEST(lua-mult-matrix ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${C 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) 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-masterslave-bypass PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-msg-masterslave-console PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(lua-chord PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") +set_tests_properties(simdag-test-lua PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") endif(HAVE_LUA) # END TESH TESTS diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c index e04bcfde89..8e15509c13 100644 --- a/examples/simdag/sd_test2.c +++ b/examples/simdag/sd_test2.c @@ -61,7 +61,14 @@ int main(int argc, char **argv) SD_init(&argc, argv); /* creation of the environment */ - SD_create_environment(argv[1]); + if (strstr(argv[1],".xml")) + SD_create_environment(argv[1]); + else + if (strstr(argv[1],".lua")) + SD_load_environment_script(argv[1]); + else + xbt_die("Unsupported platform description styel (neither XML nor lua): %s", + argv[1]); /* getting platform infos */ n_hosts = SD_workstation_get_number(); diff --git a/examples/simdag/test_simdag2_lua.tesh b/examples/simdag/test_simdag2_lua.tesh new file mode 100644 index 0000000000..d4b5560060 --- /dev/null +++ b/examples/simdag/test_simdag2_lua.tesh @@ -0,0 +1,7 @@ +#! ./tesh + +p Simple test of simdag. Environment described in 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 -- 2.20.1