update catch2 macro, fix conflicts

Author: cmcfarlen

lib/CMakeLists.txt

@@ -50,11 +50,22 @@ if(BUILD_TESTING)
   # done in one TEST_CASE expected to carry over into the next TEST_CASE. This
   # macro allows us to add common command line arguments to all tests. For now,
   # we ensure declaration order execution via --order decl.
+  # macro(add_catch2_test)
+  #   set(oneValueArgs NAME ENVIRONMENT)
+  #   cmake_parse_arguments(CATCH2_TEST "" ${oneValueArgs} "" ${ARGN})
+  #   catch_discover_tests(${CATCH2_TEST_NAME} PROPERTIES ENVIRONMENT ${CATCH2_TEST_ENVIRONMENT})
+  # endmacro()
   macro(add_catch2_test)
-    set(oneValueArgs NAME ENVIRONMENT)
-    cmake_parse_arguments(CATCH2_TEST "" ${oneValueArgs} "" ${ARGN})
-    catch_discover_tests(${CATCH2_TEST_NAME} PROPERTIES ENVIRONMENT ${CATCH2_TEST_ENVIRONMENT})
+    cmake_parse_arguments(CATCH2_TEST "" "NAME" "ENVIRONMENT" ${ARGN})
+
+    set(_catch_properties)
+    if(CATCH2_TEST_ENVIRONMENT)
+      list(APPEND _catch_properties ENVIRONMENT "${CATCH2_TEST_ENVIRONMENT}")
+    endif()
+
+    catch_discover_tests(${CATCH2_TEST_NAME} PROPERTIES ${_catch_properties})
   endmacro()
+
 endif()
 
 if(NOT TARGET yaml-cpp::yaml-cpp)

plugins/esi/test/CMakeLists.txt

@@ -21,11 +21,8 @@ target_link_libraries(esitest PUBLIC esi-common esicore)
 macro(ADD_ESI_TEST NAME)
   add_executable(${NAME} print_funcs.cc ${ARGN})
   target_link_libraries(${NAME} PRIVATE esitest)
-  add_catch2_test(NAME ${NAME} COMMAND $<TARGET_FILE:${NAME}>)
-  # Use ASan leak suppression for intentional DbgCtl leaks (issue #12776)
-  set_tests_properties(
-    ${NAME} PROPERTIES ENVIRONMENT
-                           "LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/esi_test_leak_suppression.txt"
+  add_catch2_test(
+    NAME ${NAME} ENVIRONMENT "LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/esi_test_leak_suppression.txt"
   )
 endmacro()