Skip to content

Add Valgrind Targets to Unit Tests [DEVINFRA-550] #102

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

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Add Valgrind Targets to Unit Tests [DEVINFRA-550] #102

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions TestTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#
# swift_add_test(test-suite-name
# <UNIT_TEST|INTEGRATION_TEST>
# VALGRIND_MEMCHECK
# SRCS
# main.cc
# ...more source files
Expand All @@ -42,7 +43,25 @@
# integration test. If either option is not specified, a cmake warning will be
# raised. If both are specified, a cmake error will be raised.
#
# LINK, INCLUDE, and WORKING_DIRECTORY are optional parameters.
# VALGRIND_MEMCHECK, LINK, INCLUDE, and WORKING_DIRECTORY are optional
# parameters.
#
# VALGRIND_MEMCHECK is a convenience parameter that will call
# swift_add_valgrind_memcheck with the following parameters:
#
# swift_add_valgrind_memcheck(${target}
# LEAK_CHECK full
# WORKING_DIRECTORY <path>
# SHOW_REACHABLE
# UNDEF_VALUE_ERRORS
# TRACK_ORIGINS
# CHILD_SILENT_AFTER_FORK
# TRACE_CHILDREN
# GENERATE_JUNIT_REPORT
# )
#
# This parameter is not allowed to be set with INTEGRATION_TEST.
# See Valgrind.cmake for the full documentation of this function.
#
# If WORKING_DIRECTORY is not specified the tests will be run in
# ${CMAKE_CURRENT_BINARY_DIR}
Expand Down Expand Up @@ -237,7 +256,7 @@ function(swift_add_test_runner target)
endfunction()

function(swift_add_test target)
set(argOption "INTEGRATION_TEST" "PARALLEL" "POST_BUILD" "UNIT_TEST")
set(argOption "INTEGRATION_TEST" "PARALLEL" "POST_BUILD" "UNIT_TEST" "VALGRIND_MEMCHECK")
set(argSingle "COMMENT" "WORKING_DIRECTORY")
set(argMulti "SRCS" "LINK" "INCLUDE")

Expand Down Expand Up @@ -265,6 +284,8 @@ function(swift_add_test target)
message(WARNING "Missing INTEGRATION_TEST or UNIT_TEST option")
elseif(x_INTEGRATION_TEST AND x_UNIT_TEST)
message(FATAL_ERROR "Both INTEGRATION_TEST and UNIT_TEST option were specified, you can only specify one")
elseif(x_INTEGRATION_TEST AND x_VALGRIND_MEMCHECK)
message(FATAL_ERROR "VALGRIND_MEMCHECK can only be specified with UNIT_TEST")
endif()

add_executable(${target} EXCLUDE_FROM_ALL ${x_SRCS})
Expand Down Expand Up @@ -325,6 +346,20 @@ function(swift_add_test target)
else()
add_dependencies(do-all-unit-tests do-${target})
endif()

if (x_VALGRIND_MEMCHECK)
include(Valgrind)
swift_add_valgrind_memcheck(${target}
LEAK_CHECK full
${wd}
SHOW_REACHABLE
UNDEF_VALUE_ERRORS
TRACK_ORIGINS
CHILD_SILENT_AFTER_FORK
TRACE_CHILDREN
GENERATE_JUNIT_REPORT
)
endif()
endif()

if(x_POST_BUILD)
Expand Down