SWDEV-273235 - catch2 packaging for jenkins build (#2430)

Change-Id: I9686b3e26d4e8a24ce97ac1e1f31a4293678d577

catch/external/Catch2/cmake/Catch2/Catch.cmake

@@ -169,9 +169,12 @@ function(catch_discover_tests TARGET)
     VERBATIM
   )
 
+  file(RELATIVE_PATH ctestincludepath ${CMAKE_CURRENT_BINARY_DIR} ${ctest_include_file})
+  file(RELATIVE_PATH ctestfilepath ${CMAKE_CURRENT_BINARY_DIR} ${ctest_tests_file})
+
   file(WRITE "${ctest_include_file}"
-    "if(EXISTS \"${ctest_tests_file}\")\n"
-    "  include(\"${ctest_tests_file}\")\n"
+    "if(EXISTS \"${ctestfilepath}\")\n"
+    "  include(\"${ctestfilepath}\")\n"
     "else()\n"
     "  message(WARNING \"Test ${TARGET} not built yet.\")\n"
     "endif()\n"
@@ -180,14 +183,14 @@ function(catch_discover_tests TARGET)
   if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
     # Add discovered tests to directory TEST_INCLUDE_FILES
     set_property(DIRECTORY
-      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
+      APPEND PROPERTY TEST_INCLUDE_FILES "${ctestincludepath}"
     )
   else()
     # Add discovered tests as directory TEST_INCLUDE_FILE if possible
     get_property(test_include_file_set DIRECTORY PROPERTY TEST_INCLUDE_FILE SET)
     if (NOT ${test_include_file_set})
       set_property(DIRECTORY
-        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
+        PROPERTY TEST_INCLUDE_FILE "${ctestincludepath}"
       )
     else()
       message(FATAL_ERROR

catch/external/Catch2/cmake/Catch2/CatchAddTests.cmake

@@ -107,12 +107,14 @@ foreach(line ${output})
     string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
     set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
   endif()
-  
+
+  file(RELATIVE_PATH exe_path ${CMAKE_CURRENT_BINARY_DIR} ${TEST_EXECUTABLE})
+
   # ...and add to script
   add_command(add_test
     "${prefix}${test}${suffix}"
     ${TEST_EXECUTOR}
-    "${TEST_EXECUTABLE}"
+    "${exe_path}"
     "${test_name}"
     ${extra_args}
     "${reporter_arg}"
@@ -121,7 +123,6 @@ foreach(line ${output})
   add_command(set_tests_properties
     "${prefix}${test}${suffix}"
     PROPERTIES
-    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
     ${properties}
   )
   list(APPEND tests "${prefix}${test}${suffix}")