kill another avoidable XML

diff --git a/teshsuite/mc/replay/CMakeLists.txt b/teshsuite/mc/replay/CMakeLists.txt
index edec841..3b2d79a 100644 (file)
--- a/teshsuite/mc/replay/CMakeLists.txt
+++ b/teshsuite/mc/replay/CMakeLists.txt
@@ -4,4 +4,3 @@ target_link_libraries(random_bug simgrid)
 set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/random_bug.tesh
                                      ${CMAKE_CURRENT_SOURCE_DIR}/random_bug_replay.tesh  PARENT_SCOPE)
 set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/random_bug.c            PARENT_SCOPE)
-set(xml_files      ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/random_bug.xml          PARENT_SCOPE)

diff --git a/teshsuite/mc/replay/random_bug.c b/teshsuite/mc/replay/random_bug.c
index f0967f9..9fbb738 100644 (file)
--- a/teshsuite/mc/replay/random_bug.c
+++ b/teshsuite/mc/replay/random_bug.c
@@ -31,6 +31,6 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
   MSG_function_register("app", &app);
   MSG_create_environment(argv[1]);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("app", app, NULL, MSG_get_host_by_name("Tremblay"));
   return MSG_main();
 }

diff --git a/teshsuite/mc/replay/random_bug.tesh b/teshsuite/mc/replay/random_bug.tesh
index b37fc24..b41a234 100644 (file)
--- a/teshsuite/mc/replay/random_bug.tesh
+++ b/teshsuite/mc/replay/random_bug.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 ! expect return 1
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random_bug ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/random_bug.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=model-check/record:1
+$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random_bug ${srcdir:=.}/examples/platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=model-check/record:1
 > [  0.000000] (0:maestro@) Check a safety property
 > [  0.000000] (0:maestro@) **************************
 > [  0.000000] (0:maestro@) *** PROPERTY NOT VALID ***

diff --git a/teshsuite/mc/replay/random_bug.xml b/teshsuite/mc/replay/random_bug.xml
deleted file mode 100644 (file)
index d9ecb02..0000000
--- a/teshsuite/mc/replay/random_bug.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="app"/>
-</platform>

diff --git a/teshsuite/mc/replay/random_bug_replay.tesh b/teshsuite/mc/replay/random_bug_replay.tesh
index 59cebd2..240ebdb 100644 (file)
--- a/teshsuite/mc/replay/random_bug_replay.tesh
+++ b/teshsuite/mc/replay/random_bug_replay.tesh
@@ -1,4 +1,4 @@
 #!/usr/bin/env tesh
-$ ${bindir:=.}/random_bug  ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/random_bug.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4"
+$ ${bindir:=.}/random_bug  ${srcdir:=.}/examples/platforms/small_platform.xml  --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4"
 > [  0.000000] (0:maestro@) path=1/3;1/4
 > Error reached

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 137db4f..c0d1c06 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -51,7 +51,7 @@ IF(NOT enable_memcheck)
     ADD_TEST(test-tracing-help    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test --help-tracing)
   # END TESH TESTS
 
-  ADD_TESH(mc-replay-random-bug                  --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug_replay.tesh)
+  ADD_TESH(mc-replay-random-bug                  --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug_replay.tesh)
 
   ### MC ###
   IF(HAVE_MC)
@@ -63,7 +63,7 @@ IF(NOT enable_memcheck)
     ADD_TESH(tesh-mc-without-mutex-handling           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc without_mutex_handling.tesh --cfg=model-check/reduction:none)
     ADD_TESH(tesh-mc-without-mutex-handling-dpor      --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc without_mutex_handling.tesh --cfg=model-check/reduction:dpor)
 
-    ADD_TESH(mc-record-random-bug                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug.tesh)
+    ADD_TESH(mc-record-random-bug                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug.tesh)
 
     ADD_TESH_FACTORIES(mc-bugged1                "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
     ADD_TESH_FACTORIES(mc-bugged2                "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)