Skip to content

add DEF_SOURCE_LINE to ctests #1848

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 4 commits into from
Apr 18, 2025
Merged

add DEF_SOURCE_LINE to ctests #1848

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8776b8e
add DEF_SOURCE_LINE to ctests
malsyned Apr 14, 2025
8dd7f6d
document ctest -ll parsing regex
malsyned Apr 15, 2025
cde20a4
clearer ident names in ctest -ll regex application
malsyned Apr 15, 2025
7395fe0
convert add_test_to_script() to macro
malsyned Apr 15, 2025
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
80 changes: 60 additions & 20 deletions cmake/Modules/_CppUTestDiscovery.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,27 @@ if(NOT EXISTS "${EXECUTABLE}")
)
endif()

if(TESTS_DETAILED)
set(discovery_arg "-ln")
set(select_arg "-st")
else()
set(discovery_arg "-lg")
set(select_arg "-sg")
endif()
macro(add_test_to_script TEST_NAME TEST_LOCATION SELECT_ARG)
add_command(
add_test
"${TEST_NAME}"
${EMULATOR}
"${EXECUTABLE}"
${ARGS}
${SELECT_ARG}
${TEST_NAME}
)
add_command(
set_tests_properties
"${TEST_NAME}"
PROPERTIES
DEF_SOURCE_LINE
"${TEST_LOCATION}"
)
endmacro()

execute_process(
COMMAND ${EMULATOR} "${EXECUTABLE}" ${discovery_arg}
COMMAND ${EMULATOR} "${EXECUTABLE}" -ll
OUTPUT_VARIABLE discovered_tests
RESULT_VARIABLE result
ERROR_VARIABLE error
Expand All @@ -41,17 +52,46 @@ if(NOT ${result} EQUAL 0)
"${error}"
)
endif()
separate_arguments(discovered_tests)
foreach(test_name IN LISTS discovered_tests)
add_command(
add_test
"${test_name}"
${EMULATOR}
"${EXECUTABLE}"
${ARGS}
${select_arg}
${test_name}
)
endforeach()

string(CONCAT LL_LINE_REGEX
"^([^.]*)" # test group
"\\."
"([^.]*)" # test name
"\\."
"(.*)" # file name (only this field is allowed to contain dots)
"\\."
"([^.]*)" # line number
"\n"
)
string(REGEX MATCHALL "[^\n]+\n" discovered_test_lines "${discovered_tests}")
if(TESTS_DETAILED)
foreach(line IN LISTS discovered_test_lines)
string(REGEX MATCH "${LL_LINE_REGEX}" __unused "${line}")
set(test_name "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
set(test_location "${CMAKE_MATCH_3}:${CMAKE_MATCH_4}")
add_test_to_script("${test_name}" "${test_location}" -st)
endforeach()
else()
foreach(line IN LISTS discovered_test_lines)
string(REGEX MATCH "${LL_LINE_REGEX}" __unused "${line}")
set(test_name "${CMAKE_MATCH_1}")
set(test_file "${CMAKE_MATCH_3}")
set(test_line "${CMAKE_MATCH_4}")
if (NOT _${test_name}_file)
# if the group spans two files, arbitrarily choose the first one encountered
set(_${test_name}_file "${test_file}")
set(_${test_name}_line "${test_line}")
elseif(test_file STREQUAL _${test_name}_file AND test_line LESS _${test_name}_line)
# line number will eventually be the first line of the first test in the group's file
set(_${test_name}_line ${test_line})
endif()
list(APPEND groups_seen ${test_name})
endforeach()
list(REMOVE_DUPLICATES groups_seen)
foreach(test_name IN LISTS groups_seen)
set(test_location "${_${test_name}_file}:${_${test_name}_line}")
add_test_to_script("${test_name}" "${test_location}" -sg)
endforeach()
endif()

file(WRITE "${CTEST_FILE}" "${script}")
Loading