From b6976a77beb2f9a48d14fc88e366c2bc55c8d514 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 18 Mar 2016 13:43:10 +0100 Subject: [PATCH] kill avoidable XML --- teshsuite/simix/stack_overflow/CMakeLists.txt | 4 +--- teshsuite/simix/stack_overflow/stack_overflow.c | 4 ++-- teshsuite/simix/stack_overflow/stack_overflow.tesh | 2 +- teshsuite/simix/stack_overflow/stack_overflow.xml | 5 ----- teshsuite/simix/stack_overflow/stack_overflow_platform.xml | 7 ------- 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 teshsuite/simix/stack_overflow/stack_overflow.xml delete mode 100644 teshsuite/simix/stack_overflow/stack_overflow_platform.xml diff --git a/teshsuite/simix/stack_overflow/CMakeLists.txt b/teshsuite/simix/stack_overflow/CMakeLists.txt index a3e4bafbc0..08be8de9dc 100644 --- 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 1f247112c5..9a951fe656 100644 --- 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 e7937c2047..fc18efa7a9 100644 --- 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 index ea69ac8dc1..0000000000 --- a/teshsuite/simix/stack_overflow/stack_overflow.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml b/teshsuite/simix/stack_overflow/stack_overflow_platform.xml deleted file mode 100644 index 72c5c0587c..0000000000 --- a/teshsuite/simix/stack_overflow/stack_overflow_platform.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - -- 2.20.1