Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: remove support for ctest_memcheck() and run_memorycheck.cmake #15716

Merged
merged 1 commit into from
Jul 11, 2023
Merged

CMake: remove support for ctest_memcheck() and run_memorycheck.cmake #15716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 0 additions & 27 deletions doc/developers/testsuite.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,33 +306,6 @@ <h3>How to interpret the output</h3>
</p>


<a name="memcheck"></a>
<h3>Running with valgrind</h3>

<p>
The testsuite can also be run using <a href="http://valgrind.org/">valgrind</a>
to check for <i>memory corruption</i> in the library.
</p>

<p>
You can do so by invoking
<pre>
ctest -DMEMORYCHECK=ON <...> -S ../tests/run_testsuite.cmake
</pre>
when running the testsuite, or directly by
<pre>
ctest <...> -S ../tests/run_memorycheck.cmake
</pre>
</p>

<p>
At the end of all of this, results will be shown in a separate section
"Dynamic Analysis" at the
<a href="https://cdash.dealii.org/index.php?project=deal.II&display=project"
target="_top">deal.II cdash site</a>.
</p>


<a name="coverage"></a>
<h3>Generating coverage information</h3>

Expand Down
3 changes: 0 additions & 3 deletions tests/run_memorycheck.cmake
View file
Open in desktop

This file was deleted.

43 changes: 3 additions & 40 deletions tests/run_testsuite.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@
# ctest_coverage() stage will be run. Test results must go into the
# "Experimental" section.
#
# MEMORYCHECK
# - If set to ON the CTEST_MEMORYCHECK() stage will be run.
# Test results must go into the "Experimental" section.
#
# MAKEOPTS
# - Additional options that will be passed directly to make (or ninja).
#
Expand Down Expand Up @@ -436,35 +432,6 @@ endif()
message("-- COVERAGE: ${COVERAGE}")


#
# Setup memcheck:
#

if(MEMORYCHECK)
if(NOT TRACK MATCHES "Experimental")
message(FATAL_ERROR "
TRACK must be set to \"Experimental\" if Memcheck is enabled via
MEMORYCHECK=TRUE.
"
)
endif()

find_program(MEMORYCHECK_COMMAND NAMES valgrind)
if(MEMORYCOMMAND MATCHES "-NOTFOUND")
message(FATAL_ERROR "
Memcheck enabled but could not find the valgrind executable. Please install
valgrind.
"
)
endif()

set(CTEST_MEMORYCHECK_COMMAND "${MEMORYCHECK_COMMAND}")
endif()

message("-- MEMORYCHECK: ${MEMORYCHECK}")



macro(create_targetdirectories_txt)
#
# It gets tricky: Fake a TargetDirectories.txt containing _all_ target
Expand Down Expand Up @@ -563,13 +530,9 @@ if("${_res}" STREQUAL "0")
if(DEAL_II_MSVC)
set(CTEST_BUILD_CONFIGURATION "${JOB_BUILD_CONFIGURATION}")
endif()
if(MEMORYCHECK)
message("-- Running ctest_memcheck()")
ctest_memcheck()
else()
message("-- Running CTEST_TESTS()")
ctest_test()
endif()

message("-- Running CTEST_TESTS()")
ctest_test()

if(COVERAGE)
CREATE_TARGETDIRECTORIES_TXT()
Expand Down