From 32f2e62630757689a790719c9cdc409650672db2 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 18 Mar 2016 18:43:29 +0100 Subject: [PATCH] try to blindly fix test --- teshsuite/mc/CMakeLists.txt | 8 ++++---- teshsuite/mc/mutex-handling/mutex-handling.tesh | 2 +- teshsuite/mc/mutex-handling/without-mutex-handling.tesh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 40ad3a8b0c..11a2bd54da 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -31,10 +31,10 @@ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/rando set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/mutex-handling_d.xml PARENT_SCOPE) IF(HAVE_MC) - ADD_TESH(tesh-mc-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:none) -# ADD_TESH(tesh-mc-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:dpor) - ADD_TESH(tesh-mc-without-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:none) - ADD_TESH(tesh-mc-without-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:dpor) + ADD_TESH(tesh-mc-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:none) +# ADD_TESH(tesh-mc-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:dpor) + ADD_TESH(tesh-mc-without-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:none) + ADD_TESH(tesh-mc-without-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:dpor) ADD_TESH(mc-random-bug-record --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug-report.tesh) ENDIF() diff --git a/teshsuite/mc/mutex-handling/mutex-handling.tesh b/teshsuite/mc/mutex-handling/mutex-handling.tesh index 0df840c42c..81c2d79ebd 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 ../../examples/platforms/platform.xml mutex_handling.xml +$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/with_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 f950a22572..fa4fae7553 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 ../../examples/platforms/platform.xml mutex_handling.xml +$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/without_mutex_handling ${srcdir:=.}/examples/platforms/platform.xml mutex_handling.xml mutex_handling.xml -- 2.20.1