From 17fb4b64f0bfb6f25debbcbdf4577812284e6e9e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 5 Nov 2023 01:10:37 +0100 Subject: [PATCH] Add a cmake option to disable McMini tests, and rename some existing ones Old configurations should be updated seamlessly. --- .circleci/config.yml | 2 +- .github/workflows/git.yml | 8 ++++---- .gitlab-ci.yml | 4 ++-- CMakeLists.txt | 7 ++++--- ChangeLog | 2 +- docs/source/Installing_SimGrid.rst | 9 ++++++--- teshsuite/mc/CMakeLists.txt | 12 ++++++------ teshsuite/smpi/MBI/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/attr/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/coll/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/comm/CMakeLists.txt | 4 ++-- .../smpi/mpich3-test/datatype/CMakeLists.txt | 4 ++-- .../smpi/mpich3-test/errhan/CMakeLists.txt | 4 ++-- .../smpi/mpich3-test/f77/attr/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/coll/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/comm/CMakeLists.txt | 2 +- .../mpich3-test/f77/datatype/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/ext/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/info/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/init/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/pt2pt/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/rma/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/topo/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f77/util/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/coll/CMakeLists.txt | 2 +- .../mpich3-test/f90/datatype/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/info/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/init/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/pt2pt/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/rma/CMakeLists.txt | 2 +- .../smpi/mpich3-test/f90/util/CMakeLists.txt | 2 +- .../smpi/mpich3-test/group/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/info/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/init/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/io/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/perf/CMakeLists.txt | 4 ++-- .../smpi/mpich3-test/pt2pt/CMakeLists.txt | 2 +- teshsuite/smpi/mpich3-test/rma/CMakeLists.txt | 4 ++-- teshsuite/smpi/mpich3-test/topo/CMakeLists.txt | 4 ++-- tools/cmake/Option.cmake | 18 ++++++++++++++++-- tools/jenkins/Coverage.sh | 4 ++-- tools/jenkins/DynamicAnalysis.sh | 2 +- tools/jenkins/Flags.sh | 4 ++-- tools/jenkins/Sanitizers.sh | 4 ++-- tools/jenkins/build.sh | 4 ++-- 46 files changed, 94 insertions(+), 76 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index abd99f5377..b505615c32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,5 @@ jobs: name: Configure, build and test da stuff command: | mkdir _build && cd _build - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_model-checking=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON .. + cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_model-checking=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=OFF -Denable_compile_warnings=ON .. make -j4 tests && ctest -j4 --output-on-failure diff --git a/.github/workflows/git.yml b/.github/workflows/git.yml index 39d03c27d6..71c02273b9 100644 --- a/.github/workflows/git.yml +++ b/.github/workflows/git.yml @@ -39,8 +39,8 @@ jobs: mkdir build ; cd build cmake -GNinja -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \ -Denable_compile_optimizations=ON -Denable_compile_warnings=ON \ - -Denable_model-checking=OFF -Denable_smpi_MBI_testsuite=OFF \ - -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON \ + -Denable_model-checking=OFF -Denable_testsuite_smpi_MBI=OFF \ + -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=ON \ -DCMAKE_DISABLE_SOURCE_CHANGES=ON -DLTO_EXTRA_FLAG="auto" .. ninja tests ctest --output-on-failure -j$(nproc) @@ -77,8 +77,8 @@ jobs: mkdir build ; cd build cmake -GNinja -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \ -Denable_compile_optimizations=ON -Denable_compile_warnings=ON \ - -Denable_model-checking=ON -Denable_smpi_MBI_testsuite=OFF \ - -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF \ + -Denable_model-checking=ON -Denable_testsuite_smpi_MBI=OFF \ + -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=OFF \ -Denable_ns3=OFF \ -DCMAKE_DISABLE_SOURCE_CHANGES=ON -DLTO_EXTRA_FLAG="auto" .. ninja tests diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89000b0400..bbf969ba45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ ctest-debug: script: - apt-get --allow-releaseinfo-change update - apt install -y binutils xsltproc - - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" . + - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=ON -Denable_testsuite_McMini=ON -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" . - make -j$(nproc) VERBOSE=1 all tests - ctest -T Test -j$(nproc) --output-on-failure - xsltproc ./tools/jenkins/ctest2junit.xsl Testing/"$( head -n 1 < Testing/TAG )"/Test.xml > CTestResults.xml @@ -31,7 +31,7 @@ ctest-modelchecking: script: - apt-get --allow-releaseinfo-change update - apt install -y binutils xsltproc clang - - cmake -Denable_model-checking=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . + - cmake -Denable_model-checking=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=OFF -Denable_testsuite_McMini=OFF -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ . - make -j$(nproc) VERBOSE=1 all tests - ctest -T Test -j$(nproc) --output-on-failure - xsltproc ./tools/jenkins/ctest2junit.xsl Testing/"$( head -n 1 < Testing/TAG )"/Test.xml > CTestResults.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index ec4f39bbd1..4b7925f26b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -946,15 +946,16 @@ else() endif() message(" Compile Smpi ................: ${HAVE_SMPI}") message(" Smpi fortran ..............: ${SMPI_FORTRAN}") -message(" MPICH3 testsuite ..........: ${enable_smpi_MPICH3_testsuite}") -message(" MBI testsuite .............: ${enable_smpi_MBI_testsuite}") +message(" MPICH3 testsuite ..........: ${enable_testsuite_smpi_MPICH3}") +message(" MBI testsuite .............: ${enable_testsuite_smpi_MBI}") message(" Privatization .............: ${HAVE_PRIVATIZATION}") message(" PAPI support ..............: ${HAVE_PAPI}") message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}") message("") message(" Model checking ..............: ${SIMGRID_HAVE_MC}") message(" Stateful model checking ...: ${SIMGRID_HAVE_STATEFUL_MC}") -message(" MBI testsuite .............: ${enable_smpi_MBI_testsuite}") +message(" MBI testsuite .............: ${enable_testsuite_smpi_MBI}") +message(" McMini testsuite ..........: ${enable_testsuite_McMini}") message("") message(" Maintainer mode .............: ${enable_maintainer_mode}") message(" Documentation ...............: ${enable_documentation}") diff --git a/ChangeLog b/ChangeLog index e5782ea712..c3dd61afbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,7 +42,7 @@ sthread: - Allow to use on valgrind-observed processes - Install sthread on user's disk. - Implement recursive pthreads. - - Add some McMini codes to test sthread further. + - Add some McMini codes to test sthread further (controlled with enable_testsuite_McMini). Model checking: - More informative backtraces on assertion failure. diff --git a/docs/source/Installing_SimGrid.rst b/docs/source/Installing_SimGrid.rst index 7d268678ef..0953584210 100644 --- a/docs/source/Installing_SimGrid.rst +++ b/docs/source/Installing_SimGrid.rst @@ -254,10 +254,13 @@ enable_ns3 (on/OFF) enable_smpi (ON/off) Allows one to run MPI code on top of SimGrid. -enable_smpi_MBI_testsuite (on/OFF) - Adds many extra tests for the model checker module. +enable_testsuite_McMini (on/OFF) + Adds several extra tests for the model checker module (targeting threaded applications). -enable_smpi_MPICH3_testsuite (on/OFF) +enable_testsuite_smpi_MBI (on/OFF) + Adds many extra tests for the model checker module (targeting MPI applications). + +enable_testsuite_smpi_MPICH3 (on/OFF) Adds many extra tests for the MPI module. minimal-bindings (on/OFF) diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt index 67fe6ab6ec..0169a17814 100644 --- a/teshsuite/mc/CMakeLists.txt +++ b/teshsuite/mc/CMakeLists.txt @@ -54,8 +54,7 @@ if(enable_coverage) endif() -if("${CMAKE_SYSTEM}" MATCHES "Linux") - foreach(x +foreach(x # # simple_cond_broadcast_deadlock simple_semaphore_deadlock simple_barrier_deadlock simple_cond_deadlock # simple_semaphores_deadlock @@ -83,9 +82,10 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux") # simple_mutex_with_threads_ok simple_semaphores_ok simple_semaphores_with_threads_ok simple_threads_ok ) - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.c) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh) + set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.c) + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh) + if("${CMAKE_SYSTEM}" MATCHES "Linux" AND ${enable_testsuite_McMini}) add_executable (mcmini-${x} EXCLUDE_FROM_ALL mcmini/${x}.c) set_target_properties(mcmini-${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mcmini) target_link_libraries(mcmini-${x} PRIVATE Threads::Threads) @@ -95,8 +95,8 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux") endif() ADD_TESH(mc-mini-${x} --setenv libdir=${CMAKE_BINARY_DIR}/lib --setenv bindir=${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/mcmini/${x}.tesh) - endforeach() -endif() + endif() +endforeach() set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/random-bug-replay.tesh diff --git a/teshsuite/smpi/MBI/CMakeLists.txt b/teshsuite/smpi/MBI/CMakeLists.txt index d0c587e9cc..9ea75baf7d 100644 --- a/teshsuite/smpi/MBI/CMakeLists.txt +++ b/teshsuite/smpi/MBI/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB generator_scripts *Generator.py) -if (enable_smpi_MBI_testsuite) +if (enable_testsuite_smpi_MBI) if (NOT enable_smpi) message(FATAL_ERROR "The MBI test suite cannot be enabled without SMPI. Please change either setting.") endif() diff --git a/teshsuite/smpi/mpich3-test/CMakeLists.txt b/teshsuite/smpi/mpich3-test/CMakeLists.txt index f355696cdb..8d021ea1a8 100644 --- a/teshsuite/smpi/mpich3-test/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/CMakeLists.txt @@ -38,7 +38,7 @@ set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/") -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) if(HAVE_PRIVATIZATION) add_library(mtest_c STATIC util/dtypes.c util/mtest.c util/mtestcheck.c util/mtest_datatype.c util/mtest_datatype_gen.c) else() @@ -46,7 +46,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() endif() -IF(enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +IF(enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) ADD_TEST(test-smpi-mpich3-thread-f77 ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f77/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f77/ -tests=testlist -privatization=${HAVE_PRIVATIZATION} -execarg=--cfg=contexts/stack-size:8000 -execarg=--cfg=contexts/factory:thread -execarg=--cfg=smpi/privatization:${HAVE_PRIVATIZATION}) SET_TESTS_PROPERTIES(test-smpi-mpich3-thread-f77 PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") ADD_TEST(test-smpi-mpich3-thread-f90 ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/f90/ ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/f90/ -tests=testlist -privatization=${HAVE_PRIVATIZATION} -execarg=--cfg=smpi/privatization:${HAVE_PRIVATIZATION} -execarg=--cfg=contexts/factory:thread) diff --git a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt index acdfd5d0d6..05d62546cd 100644 --- a/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/attr/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -13,7 +13,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-attr-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/attr ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/attr -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-attr-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt index 6c4a1a75a3..c07450a874 100644 --- a/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") # There are too many warnings with these programs diff --git a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt index 4bed718a43..86f91a2616 100644 --- a/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/comm/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -15,7 +15,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-comm-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/comm ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/comm -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-comm-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt index b9d31e5940..2e4d7bfd71 100644 --- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -31,7 +31,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-datatype-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/datatype ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-datatype-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/errhan/CMakeLists.txt b/teshsuite/smpi/mpich3-test/errhan/CMakeLists.txt index e941496512..f16e19cf77 100644 --- a/teshsuite/smpi/mpich3-test/errhan/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/errhan/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-errhan-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/errhan ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/errhan -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-errhan-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt index fee3ec3c7e..2b8909c338 100644 --- a/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt index 30bbd89096..de624ed881 100644 --- a/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt index d28313a674..f864421f26 100644 --- a/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt index 4c550312be..615b08a68f 100644 --- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt index 9ac4ac9265..9c4e6260e7 100644 --- a/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt index 4aac50dc9d..0bdc36cd5b 100644 --- a/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt index 2a3e74fec7..6e6b1274a4 100644 --- a/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt index f6f088d625..44e53d7a4b 100644 --- a/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt index 1daf583849..7b0ea935ed 100644 --- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt index f8964a5ec8..d713eb74b0 100644 --- a/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt index e88db7ea9c..b8e9ebb39e 100644 --- a/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt index 1dc21fe9e9..22be2e5144 100644 --- a/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt index e80c5145df..a8a45ce22c 100644 --- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt index b4fb632973..3ee04a0d6d 100644 --- a/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt index 3ce5a7cdb5..18906d1071 100644 --- a/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt index 4ad7bd8148..0004e520ed 100644 --- a/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt index 48f19fcee9..4bea7c0bf9 100644 --- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt index e2f0a9bcba..68fab4d1e1 100644 --- a/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN) +if(enable_smpi AND enable_testsuite_smpi_MPICH3 AND SMPI_FORTRAN) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90") diff --git a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt index 2f3cb24f7f..c1364f8917 100644 --- a/teshsuite/smpi/mpich3-test/group/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/group/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-group-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/group ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-group-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt index 4d6d572ebd..068e157100 100644 --- a/teshsuite/smpi/mpich3-test/info/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/info/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-info-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/info ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/info -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-info-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt index 4a8a6e8c8d..951fa6c39d 100644 --- a/teshsuite/smpi/mpich3-test/init/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/init/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-init-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/init ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-init-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/io/CMakeLists.txt b/teshsuite/smpi/mpich3-test/io/CMakeLists.txt index 643b4ab4d8..4856c2474e 100644 --- a/teshsuite/smpi/mpich3-test/io/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/io/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -13,7 +13,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-io-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/io ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -platformfile=../../../../examples/platforms/hosts_with_disks.xml -hostfile=../../hostfile_io -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/io -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-io-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt index c57bc7baf2..f0ec2a0a6d 100644 --- a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -13,7 +13,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) endforeach() endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-perf-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/perf ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -tests=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/perf/testlist -execarg=-platform\ ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster_backbone.xml -execarg=--log=root.thr:critical -execarg=--cfg=smpi/async-small-thresh:65536 -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/simulate-computation:0) endif() diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt index 8a8431ac31..0a11f39160 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") diff --git a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt index 9115003bfc..be6d1db0fd 100644 --- a/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/rma/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -37,7 +37,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite) set_target_properties(transpose3_shm PROPERTIES COMPILE_FLAGS "${MPICH_FLAGS} -DUSE_WIN_ALLOCATE") endif() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-rma-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/rma ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/rma -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-rma-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") if (enable_thread_sanitizer OR enable_coverage) diff --git a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt index 671fbcd141..7c032fc2fb 100644 --- a/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt +++ b/teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -1,4 +1,4 @@ -if(enable_smpi AND enable_smpi_MPICH3_testsuite) +if(enable_smpi AND enable_testsuite_smpi_MPICH3) set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc") set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff") @@ -19,7 +19,7 @@ foreach(file cartcreates cartshift1 cartsuball cartzero cartmap1 dgraph_unwgt di set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${file}.c) endforeach() -if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS) +if (enable_testsuite_smpi_MPICH3 AND HAVE_RAW_CONTEXTS) ADD_TEST(test-smpi-mpich3-topo-raw ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/topo ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${VALGRIND_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/topo -tests=testlist -execarg=--cfg=contexts/factory:raw) SET_TESTS_PROPERTIES(test-smpi-mpich3-topo-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!") endif() diff --git a/tools/cmake/Option.cmake b/tools/cmake/Option.cmake index c4faa2f564..a1e5334385 100644 --- a/tools/cmake/Option.cmake +++ b/tools/cmake/Option.cmake @@ -47,8 +47,22 @@ endif() option(enable_smpi "Whether SMPI is included in the library." on) option(enable_smpi_papi "Whether SMPI supports PAPI bindings." off) -option(enable_smpi_MPICH3_testsuite "Whether the test suite form MPICH 3 should be built" off) -option(enable_smpi_MBI_testsuite "Whether the test suite from MBI should be built." off) + +option(enable_testsuite_smpi_MPICH3 "Whether the test suite form MPICH 3 should be built." off) +option(enable_smpi_MPICH3_testsuite "Please use 'enable_testsuite_smpi_MPICH3' instead." off) +mark_as_advanced(enable_smpi_MPICH3_testsuite) +if(enable_smpi_MPICH3_testsuite) + SET(enable_testsuite_smpi_MPICH3 ON CACHE BOOL "Whether the test suite form MPICH 3 should be built." FORCE) +endif() + +option(enable_testsuite_smpi_MBI "Whether the test suite from MBI should be built." off) +option(enable_smpi_MBI_testsuite "Please use 'enable_testsuite_smpi_MBI' instead." off) +mark_as_advanced(enable_smpi_MBI_testsuite) +if(enable_smpi_MBI_testsuite) + SET(enable_testsuite_smpi_MBI ON CACHE BOOL "Whether the test suite from MBI should be built." FORCE) +endif() + +option(enable_testsuite_McMini "Whether the test suite from McMini should be built." off) # Internal targets used by jenkins ### diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index 4a2012df0e..8558631d89 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -65,9 +65,9 @@ cmake -Denable_documentation=OFF \ -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_mallocators=ON \ -Denable_ns3=ON \ - -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \ + -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=ON -Denable_model-checking=ON \ -Denable_smpi_papi=ON \ - -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_MBI_testsuite=ON \ + -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_testsuite_smpi_MBI=ON -Denable_testsuite_McMini=ON \ -Denable_coverage=ON -DLTO_EXTRA_FLAG="auto" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON "$WORKSPACE" #build with sonarqube scanner wrapper diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 41f0ba1c8b..2f7d99fe5e 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -61,7 +61,7 @@ ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF -Denable_python=OFF \ -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_mallocators=OFF \ - -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \ + -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=OFF -Denable_testsuite_McMini=OFF -Denable_model-checking=OFF \ -Denable_ns3=ON \ -Denable_memcheck_xml=ON -DLTO_EXTRA_FLAG="auto" "$WORKSPACE" diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index e8f9198f16..dab4330d42 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -79,8 +79,8 @@ fi cmake -Denable_documentation=OFF \ -Denable_compile_optimizations=${runtests} -Denable_compile_warnings=ON \ -Denable_mallocators=ON -Denable_debug=${builddebug} \ - -Denable_smpi=${buildsmpi} -Denable_smpi_MPICH3_testsuite=${buildsmpi} -Denable_model-checking=${buildmc} \ - -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_MBI_testsuite=OFF \ + -Denable_smpi=${buildsmpi} -Denable_testsuite_smpi_MPICH3=${buildsmpi} -Denable_model-checking=${buildmc} \ + -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_testsuite_smpi_MBI=OFF -Denable_testsuite_McMini=OFF \ -Denable_ns3=$(onoff test "$buildmc" != "ON") -DNS3_HINT=/builds/ns-3-dev/build/ \ -Denable_coverage=OFF -DLTO_EXTRA_FLAG="auto" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ "$WORKSPACE" diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh index 04b4737ea7..ef5ae0e4c0 100755 --- a/tools/jenkins/Sanitizers.sh +++ b/tools/jenkins/Sanitizers.sh @@ -77,9 +77,9 @@ ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF \ -Denable_compile_optimizations=ON -Denable_compile_warnings=ON \ -Denable_mallocators=OFF \ - -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=OFF \ + -Denable_smpi=ON -Denable_testsuite_smpi_MPICH3=ON -Denable_model-checking=OFF \ -Denable_ns3=ON \ - -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_MBI_testsuite=OFF -Denable_coverage=OFF\ + -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_testsuite_smpi_MBI=OFF -Denable_testsuite_McMini=OFF -Denable_coverage=OFF\ -Denable_fortran=OFF -Denable_python=OFF -DLTO_EXTRA_FLAG="auto" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache\ ${SANITIZER_OPTIONS} "$WORKSPACE" diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 050c850ead..0438427009 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -211,9 +211,9 @@ fi cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \ -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \ -Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \ - -Denable_smpi_MBI_testsuite=OFF \ + -Denable_testsuite_smpi_MBI=OFF -Denable_testsuite_McMini=ON \ -Denable_compile_optimizations=$(onoff test "$build_mode" != "DynamicAnalysis") \ - -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode" = "Debug") \ + -Denable_testsuite_smpi_MPICH3=$(onoff test "$build_mode" = "Debug") \ -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \ -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \ -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \ -- 2.20.1