From: Frederic Suter Date: Fri, 18 Mar 2016 12:15:34 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_13~385 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fa87f68449139c37304b07a715969ff99fab18ae?hp=69ae3560e740f4f4a031dfaa8a366ab7d6d2d486 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/.gitignore b/.gitignore index da9137ad07..41f683de32 100644 --- a/.gitignore +++ b/.gitignore @@ -260,7 +260,7 @@ teshsuite/datadesc_usage.out teshsuite/java/SemaphoreGC/SemaphoreGC_compiled teshsuite/java/SleepHostOff/SleepHostOff_compiled teshsuite/mc/dwarf/dwarf -teshsuite/mc/dwarf_expression/dwarf-expression +teshsuite/mc/dwarf-expression/dwarf-expression teshsuite/mc/replay/random_bug teshsuite/mc/with_mutex_handling teshsuite/mc/without_mutex_handling @@ -279,7 +279,7 @@ teshsuite/msg/task_destroy_cancel/task_destroy_cancel teshsuite/msg/trace_integration/trace_integration teshsuite/simdag/availability/availability teshsuite/simdag/basic-link-test/basic-link-test -teshsuite/simdag/basic-parsing-test/basic-parsing-test/ +teshsuite/simdag/basic-parsing-test/basic-parsing-test teshsuite/simdag/basic0/basic0 teshsuite/simdag/basic1/basic1 teshsuite/simdag/basic2/basic2 diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 880d9ce399..bd4e08b803 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -1,3 +1,14 @@ +foreach(x dwarf dwarf-expression) + if (HAVE_MC) + add_executable (${x} ${x}/${x}.cpp) + target_link_libraries(${x} simgrid) + set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) + endif() + + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) + set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp) +endforeach() + add_executable (with_mutex_handling mutex_handling.c) target_link_libraries(with_mutex_handling simgrid) @@ -7,5 +18,5 @@ set_target_properties(without_mutex_handling PROPERTIES COMPILE_FLAGS -DDISABLE_ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/with_mutex_handling.tesh ${CMAKE_CURRENT_SOURCE_DIR}/without_mutex_handling.tesh PARENT_SCOPE) -set(testsuite_src ${testsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.c PARENT_SCOPE) +set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.c PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.xml PARENT_SCOPE) diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.cpp b/teshsuite/mc/dwarf-expression/dwarf-expression.cpp similarity index 100% rename from teshsuite/mc/dwarf_expression/dwarf_expression.cpp rename to teshsuite/mc/dwarf-expression/dwarf-expression.cpp diff --git a/teshsuite/mc/dwarf_expression/dwarf_expression.tesh b/teshsuite/mc/dwarf-expression/dwarf-expression.tesh similarity index 100% rename from teshsuite/mc/dwarf_expression/dwarf_expression.tesh rename to teshsuite/mc/dwarf-expression/dwarf-expression.tesh diff --git a/teshsuite/mc/dwarf/CMakeLists.txt b/teshsuite/mc/dwarf/CMakeLists.txt deleted file mode 100644 index 6d15d78c39..0000000000 --- a/teshsuite/mc/dwarf/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -if(HAVE_MC) - add_executable (dwarf dwarf.cpp) - target_link_libraries(dwarf simgrid) -endif() - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/dwarf.tesh PARENT_SCOPE) -set(testsuite_src ${testsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/dwarf.cpp PARENT_SCOPE) diff --git a/teshsuite/mc/dwarf_expression/CMakeLists.txt b/teshsuite/mc/dwarf_expression/CMakeLists.txt deleted file mode 100644 index 5f03c68860..0000000000 --- a/teshsuite/mc/dwarf_expression/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -if(HAVE_MC) - add_executable (dwarf-expression dwarf_expression.cpp) - target_link_libraries(dwarf-expression simgrid) -endif() - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/dwarf_expression.tesh PARENT_SCOPE) -set(testsuite_src ${testsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/dwarf_expression.cpp PARENT_SCOPE) diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 2a57f77a0a..8f46f9cb8c 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -989,8 +989,6 @@ set(CMAKEFILES_TXT teshsuite/java/CMakeLists.txt teshsuite/mc/CMakeLists.txt - teshsuite/mc/dwarf/CMakeLists.txt - teshsuite/mc/dwarf_expression/CMakeLists.txt teshsuite/mc/replay/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/simdag/CMakeLists.txt diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake index 87f5a98f02..137db4fe65 100644 --- a/tools/cmake/Tests.cmake +++ b/tools/cmake/Tests.cmake @@ -56,7 +56,7 @@ IF(NOT enable_memcheck) ### MC ### IF(HAVE_MC) ADD_TESH(tesh-mc-dwarf --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf dwarf.tesh) - ADD_TESH(tesh-mc-dwarf-expression --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf_expression --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf_expression dwarf_expression.tesh) + ADD_TESH(tesh-mc-dwarf-expression --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf-expression --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf-expression dwarf-expression.tesh) ADD_TESH(tesh-mc-with-mutex-handling --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc with_mutex_handling.tesh --cfg=model-check/reduction:none) # ADD_TESH(tesh-mc-with-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc with_mutex_handling.tesh --cfg=model-check/reduction:dpor)