3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-16 18:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Complete adding tags as labels to tests using the JSON reporter

Browse Source
This commit is contained in:
Uy Ha 2023-10-31 22:05:28 +00:00
parent 064576520b
commit c541a31bbf
1 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
extras/CatchAddTests.cmake
View File

@ -61,7 +61,7 @@ function(catch_discover_tests_impl)
endif()
execute_process(
COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} --list-tests --verbosity normal
COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} --list-tests --reporter JSON
OUTPUT_VARIABLE output
RESULT_VARIABLE result
WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
@ -74,16 +74,6 @@ function(catch_discover_tests_impl)
)
endif()
# Make sure to escape ; (semicolons) in test names first, because
# that'd break the foreach loop for "Parse output" later and create
# wrongly splitted and thus failing test cases (false positives)
string(REPLACE ";" "\;" output "${output}")
string(STRIP "${output}" output)
string(REPLACE "\n" ";" output "${output}")
list(LENGTH output length)
math(EXPR length "${length} - 2")
list(SUBLIST output 1 "${length}" output)
# Prepare reporter
if(reporter)
set(reporter_arg "--reporter ${reporter}")
@ -125,15 +115,23 @@ function(catch_discover_tests_impl)
endforeach()
endif()
# Catch2 string escape logic is a bit funky, double quotes are escaped but single
# slash is not, the following line of code tries to handle it but it can be brittle.
string(REGEX REPLACE [[\\([^"])]] [[\\\\\1]] output "${output}")
string(JSON listings GET "${output}" "listings")
string(JSON tests GET "${listings}" "tests")
string(JSON tests_length LENGTH "${tests}")
# CMake foreach loop is inclusive
math(EXPR test_end "${tests_length} - 1")
# Parse output
foreach(line ${output})
if(line MATCHES "^ ([^ ].*)$")
set(test ${line})
foreach(index RANGE "${test_end}")
string(JSON test_spec GET "${tests}" "${index}")
string(JSON test GET "${test_spec}" "name")
# Escape characters in test case names that would be parsed by Catch2
# Note that the \ escaping must happen FIRST! Do not change the order.
set(test_name ${test})
set(test_name "${test}")
foreach(char \\ , [ ])
string(REPLACE ${char} "\\${char}" test_name ${test_name})
string(REPLACE ${char} "\\${char}" test_name "${test_name}")
endforeach(char)
# ...add output dir
if(output_dir)
@ -162,21 +160,26 @@ function(catch_discover_tests_impl)
add_command(set_tests_properties
"${prefix}${test}${suffix}"
PROPERTIES
ENVIRONMENT_MODIFICATION "${environment_modifications}")
ENVIRONMENT_MODIFICATION "${environment_modifications}"
)
endif()
list(APPEND tests "${prefix}${test}${suffix}")
elseif(line MATCHES "^ (.*)$")
set(tags "${CMAKE_MATCH_1}")
string(REGEX REPLACE "^\\[" "" tags "${tags}")
string(REGEX REPLACE "\\]$" "" tags "${tags}")
string(REPLACE "][" ";" tags "${tags}")
string(JSON tags GET "${test_spec}" "tags")
string(JSON tags_length LENGTH "${tags}")
if("${tags_length}" GREATER 0)
math(EXPR tag_end "${tags_length} - 1")
foreach(tag_index RANGE "${tag_end}")
string(JSON tag GET "${tags}" "${tag_index}")
add_command(set_tests_properties
"${prefix}${test}${suffix}"
PROPERTIES
LABELS "${tags}"
)
endforeach()
endif()
endforeach()