From: Frederic Suter Date: Fri, 18 Mar 2016 19:29:03 +0000 (+0100) Subject: damn! so many mistakes ... X-Git-Tag: v3_13~377 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4fc3489d2bcd94f1f6ac22454b6955f9d6432be2 damn! so many mistakes ... --- diff --git a/.gitignore b/.gitignore index 6d2c7ddff1..20dac52505 100644 --- a/.gitignore +++ b/.gitignore @@ -263,7 +263,7 @@ teshsuite/mc/dwarf/dwarf teshsuite/mc/dwarf-expression/dwarf-expression teshsuite/mc/random-bug/random-bug teshsuite/mc/mutex-handling/mutex-handling -teshsuite/mc/without-mutex-handling +teshsuite/mc/mutex-handling/without-mutex-handling teshsuite/msg/concurrent_rw/concurrent_rw teshsuite/msg/get_sender/get_sender teshsuite/msg/host_on_off/host_on_off diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 11a2bd54da..5d1b3efbee 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -14,7 +14,7 @@ endforeach() add_executable (without-mutex-handling mutex-handling/mutex-handling.c) target_link_libraries(without-mutex-handling simgrid) set_target_properties(without-mutex-handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1) -set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling) +set_target_properties(without-mutex-handling PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling) foreach(x mutex-handling random-bug) add_executable (${x} ${x}/${x}.c) diff --git a/teshsuite/mc/mutex-handling/mutex-handling.tesh b/teshsuite/mc/mutex-handling/mutex-handling.tesh index 6f066b0af0..bfa25fb7d0 100644 --- a/teshsuite/mc/mutex-handling/mutex-handling.tesh +++ b/teshsuite/mc/mutex-handling/mutex-handling.tesh @@ -1,4 +1,4 @@ #!/usr/bin/env tesh ! expect return 1 ! output ignore -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/with_mutex_handling ${srcdir:=.}/examples/platforms/platform.xml mutex_handling.xml +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/mutex-handling ${srcdir:=.}/examples/platforms/platform.xml mutex_handling.xml diff --git a/teshsuite/mc/mutex-handling/without-mutex-handling.tesh b/teshsuite/mc/mutex-handling/without-mutex-handling.tesh index 650ab3f976..59adf11e13 100644 --- a/teshsuite/mc/mutex-handling/without-mutex-handling.tesh +++ b/teshsuite/mc/mutex-handling/without-mutex-handling.tesh @@ -1,4 +1,4 @@ #!/usr/bin/env tesh ! expect return 1 ! output ignore -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/without_mutex_handling ${srcdir:=.}/examples/platforms/platform.xml mutex_handling.xml mutex_handling.xml +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/without-mutex-handling ${srcdir:=.}/examples/platforms/platform.xml mutex_handling.xml