From c2b6fb85ffba5b09e68d0941f2917218aefc3f2f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 10 Oct 2015 21:14:07 +0200 Subject: [PATCH 1/1] [cmake] cleanup: mv AddTests Tests --- CMakeLists.txt | 2 +- doc/doxygen/inside_cmake.doc | 2 +- doc/doxygen/module-smpi.doc | 2 +- tools/cmake/DefinePackages.cmake | 2 +- tools/cmake/Modules/FindValgrind.cmake | 2 +- tools/cmake/{AddTests.cmake => Tests.cmake} | 0 tools/cmake/scripts/generate_memcheck_tests.pl | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename tools/cmake/{AddTests.cmake => Tests.cmake} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb3d87ca2c..9b0d5ff473 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ endif() INCLUDE(CTest) ENABLE_TESTING() -include(${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake) +include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/CTestConfig.cmake) ### Define subdirectories diff --git a/doc/doxygen/inside_cmake.doc b/doc/doxygen/inside_cmake.doc index e043df16e2..bfcf98144b 100644 --- a/doc/doxygen/inside_cmake.doc +++ b/doc/doxygen/inside_cmake.doc @@ -207,7 +207,7 @@ machine. Then you have to request cmake to run your test when "ctest" is launched. For that, you have to modify source -/tools/cmake/AddTests.cmake. Make sure to pick +/tools/cmake/Tests.cmake. Make sure to pick a wise name for your test. It is often useful to check a category of tests together. The only way to do so in ctest is to use the -R argument that specifies a regular expression that the test names must diff --git a/doc/doxygen/module-smpi.doc b/doc/doxygen/module-smpi.doc index 0474d172c1..65b0f29d5c 100644 --- a/doc/doxygen/module-smpi.doc +++ b/doc/doxygen/module-smpi.doc @@ -502,7 +502,7 @@ Example: adding a "pair" version of the Alltoall collective. - To register the new version of the algorithm, simply add a line to the corresponding macro in src/smpi/colls/cools.h ( add a "COLL_APPLY(action, COLL_ALLTOALL_SIG, pair)" to the COLL_ALLTOALLS macro ). The algorithm should now be compiled and be selected when using --cfg=smpi/alltoall:pair at runtime. - - To add a test for the algorithm inside Simgrid's test suite, juste add the new algorithm name in the ALLTOALL_COLL list found inside buildtools/cmake/AddTests.cmake . When running ctest, a test for the new algorithm should be generated and executed. If it does not pass, please check your code or contact us. + - To add a test for the algorithm inside Simgrid's test suite, juste add the new algorithm name in the ALLTOALL_COLL list found inside buildtools/cmake/Tests.cmake . When running ctest, a test for the new algorithm should be generated and executed. If it does not pass, please check your code or contact us. - Feel free to push this new algorithm to the SMPI repository using Git. diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 52ab426af2..2ef2909243 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1175,7 +1175,7 @@ set(TOOLS_CMAKEFILES_TXT set(CMAKE_SOURCE_FILES CMakeLists.txt - tools/cmake/AddTests.cmake + tools/cmake/Tests.cmake tools/cmake/CTestConfig.cmake tools/cmake/CTestCustom.cmake tools/cmake/CompleteInFiles.cmake diff --git a/tools/cmake/Modules/FindValgrind.cmake b/tools/cmake/Modules/FindValgrind.cmake index 6b02522f64..bc9f1f71a6 100644 --- a/tools/cmake/Modules/FindValgrind.cmake +++ b/tools/cmake/Modules/FindValgrind.cmake @@ -24,7 +24,7 @@ if(VALGRIND_EXE) string(REGEX MATCH "[0-9].[0-9].[0-9]" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}") if(NEW_VALGRIND_VERSION) message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}") - exec_program("${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/AddTests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT) + exec_program("${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/generate_memcheck_tests.pl ${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/tools/cmake/Tests.cmake > ${CMAKE_HOME_DIRECTORY}/tools/cmake/memcheck_tests.cmake" OUTPUT_VARIABLE SHUTT) set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --trace-children-skip=/usr/bin/*,/bin/* --leak-check=full --show-reachable=yes --track-origins=no --read-var-info=no --num-callers=20 --suppressions=${CMAKE_HOME_DIRECTORY}/tools/simgrid.supp ${VALGRIND_EXTRA_COMMAND_OPTIONS} ") message(STATUS "Valgrind options: ${MEMORYCHECK_COMMAND_OPTIONS}") else() diff --git a/tools/cmake/AddTests.cmake b/tools/cmake/Tests.cmake similarity index 100% rename from tools/cmake/AddTests.cmake rename to tools/cmake/Tests.cmake diff --git a/tools/cmake/scripts/generate_memcheck_tests.pl b/tools/cmake/scripts/generate_memcheck_tests.pl index d37977aae5..62ec9f6ab3 100755 --- a/tools/cmake/scripts/generate_memcheck_tests.pl +++ b/tools/cmake/scripts/generate_memcheck_tests.pl @@ -9,10 +9,10 @@ use strict; use warnings; -# input file = AddTest.txt +# input file = Test.txt if ( $#ARGV != 1 ) { - die "Usage: generate_memcheck_tests.pl AddTests.cmake\n"; + die "Usage: generate_memcheck_tests.pl Tests.cmake\n"; } my ($proj_dir) = $ARGV[0]; -- 2.20.1