From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Wed, 23 Jan 2013 16:14:35 +0000 (+0100)
Subject: Remove simdag-test-lua
X-Git-Tag: v3_9_rc1~66
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b565321ff8836a84c3d14c22c0789858086aa6c7

Remove simdag-test-lua
---

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 215ef125cf..e71e814d82 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -316,7 +316,6 @@ if(NOT enable_memcheck)
     ADD_TEST(lua-chord                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord chord.tesh)
     ADD_TEST(lua-bittorrent                     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/bittorrent bittorrent.tesh)
     ADD_TEST(lua-kademlia                       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/kademlia kademlia.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")
@@ -324,7 +323,6 @@ if(NOT enable_memcheck)
     set_tests_properties(lua-chord                      PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-bittorrent                 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
     set_tests_properties(lua-kademlia                   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()
 
   if(enable_smpi)
diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 7c0baabb13..acab4c8d45 100644
--- a/examples/simdag/sd_test2.c
+++ b/examples/simdag/sd_test2.c
@@ -64,11 +64,8 @@ int main(int argc, char **argv)
   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 style (neither XML nor lua): %s",
-              argv[1]);
+    xbt_die("Unsupported platform description style (not XML): %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
deleted file mode 100644
index c1a328bc22..0000000000
--- a/examples/simdag/test_simdag2_lua.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! ./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