kill avoidable XML

diff --git a/teshsuite/simix/stack_overflow/CMakeLists.txt b/teshsuite/simix/stack_overflow/CMakeLists.txt
index a3e4baf..08be8de 100644 (file)
--- a/teshsuite/simix/stack_overflow/CMakeLists.txt
+++ b/teshsuite/simix/stack_overflow/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable       (stack_overflow stack_overflow.c)
 target_link_libraries(stack_overflow simgrid)
 
-ADD_TESH_FACTORIES(stack-overflow "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack_overflow --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow stack_overflow.tesh)
+ADD_TESH_FACTORIES(stack-overflow "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simix/stack_overflow --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simix/stack_overflow stack_overflow.tesh)
 
 if(release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
   foreach (factory raw thread ucontext)
@@ -13,6 +13,4 @@ if(release AND (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Darwin"))
 endif()
 
 set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.tesh          PARENT_SCOPE)
-set(xml_files      ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.xml
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow_platform.xml  PARENT_SCOPE)
 set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/stack_overflow.c             PARENT_SCOPE)

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.c b/teshsuite/simix/stack_overflow/stack_overflow.c
index 1f24711..9a951fe 100644 (file)
--- a/teshsuite/simix/stack_overflow/stack_overflow.c
+++ b/teshsuite/simix/stack_overflow/stack_overflow.c
@@ -42,11 +42,11 @@ int main(int argc, char *argv[])
 {
   SIMIX_global_init(&argc, argv);
 
-  xbt_assert(argc == 3, "Usage: %s platform.xml deployment.xml\n", argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform.xml\n", argv[0]);
 
   SIMIX_function_register("master", master);
   SIMIX_create_environment(argv[1]);
-  SIMIX_launch_application(argv[2]);
+  simcall_process_create("master", master, NULL, "Tremblay", -1, 0, NULL, NULL, 0);
   SIMIX_run();
 
   return 0;

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.tesh b/teshsuite/simix/stack_overflow/stack_overflow.tesh
index e7937c2..fc18efa 100644 (file)
--- a/teshsuite/simix/stack_overflow/stack_overflow.tesh
+++ b/teshsuite/simix/stack_overflow/stack_overflow.tesh
@@ -1,5 +1,5 @@
 ! expect signal SIGSEGV
-$ ${bindir:=.}/stack_overflow --cfg=contexts/stack_size:96 stack_overflow_platform.xml stack_overflow.xml
+$ ${bindir:=.}/stack_overflow --cfg=contexts/stack_size:96 ${srcdir:=.}/examples/platforms/small_platform.xml
 > [Tremblay:master:(0) 0.000000] [test/INFO] Launching our nice bugged recursive function...
 > Access violation detected.
 > This can result from a programming error in your code or, although less likely,

diff --git a/teshsuite/simix/stack_overflow/stack_overflow.xml b/teshsuite/simix/stack_overflow/stack_overflow.xml
deleted file mode 100644 (file)
index ea69ac8..0000000
--- a/teshsuite/simix/stack_overflow/stack_overflow.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="master"/>
-</platform>

diff --git a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml
deleted file mode 100644 (file)
index 72c5c05..0000000
--- a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-   <host id="Tremblay" speed="98.095Mf"/>
-  </AS>
-</platform>