SWDEV-385308 - hip-catch packaging issues (#293)

-install location /opt/rocm-xxxx/share/hip/catch_tests
-fix permissions of catch_tests folder

Change-Id: Ibc43a7abc55672eb2d685e5ed107e4c994d27f81


[ROCm/hip-tests commit: 0db4863f86]

projects/hip-tests/catch/external/Catch2/cmake/Catch2/Catch.cmake

@@ -228,6 +228,7 @@ function(catch_discover_tests TARGET_LIST TEST_SET)
   file(RELATIVE_PATH _CATCH_ADD_TEST_SCRIPT ${CMAKE_CURRENT_BINARY_DIR} ${ADD_SCRIPT_PATH})
   file(RELATIVE_PATH CATCH_INCLUDE_PATH ${CMAKE_CURRENT_BINARY_DIR} ${CATCH_INCLUDE_PATH})
   if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
+      file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${ctestfilepath} "")
       file(WRITE ${ctest_include_file} "set(exc_names ${TARGET_LIST})\n")
       file(APPEND ${ctest_include_file} "set(TARGET ${TEST_SET})\n")
       file(APPEND ${ctest_include_file} "set(_TEST_LIST ${TEST_SET}_TESTS)\n")

projects/hip-tests/catch/external/Catch2/cmake/Catch2/CatchAddTests.cmake

@@ -29,110 +29,116 @@ function(add_command NAME)
   set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
 endfunction()
 
-get_filename_component(TEST_EXECUTABLE ${TEST_EXECUTABLE} ABSOLUTE)
 
-# Run test executable to get list of available tests
-if(NOT EXISTS "${TEST_EXECUTABLE}")
-  message(FATAL_ERROR
-    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
-  )
-endif()
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-names-only
-  OUTPUT_VARIABLE output
-  RESULT_VARIABLE result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-# Catch --list-test-names-only reports the number of tests, so 0 is... surprising
-if(${result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no tests!\n"
-  )
-elseif(${result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${result}\n"
-    "  Output: ${output}\n"
-  )
-endif()
-
-string(REPLACE "\n" ";" output "${output}")
-
-# Run test executable to get list of available reporters
-execute_process(
-  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
-  OUTPUT_VARIABLE reporters_output
-  RESULT_VARIABLE reporters_result
-  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-)
-if(${reporters_result} EQUAL 0)
-  message(WARNING
-    "Test executable '${TEST_EXECUTABLE}' contains no reporters!\n"
-  )
-elseif(${reporters_result} LESS 0)
-  message(FATAL_ERROR
-    "Error running test executable '${TEST_EXECUTABLE}':\n"
-    "  Result: ${reporters_result}\n"
-    "  Output: ${reporters_output}\n"
-  )
-endif()
-string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
-if(reporter AND ${reporter_is_valid} EQUAL -1)
-  message(FATAL_ERROR
-    "\"${reporter}\" is not a valid reporter!\n"
-  )
-endif()
-
-# Prepare reporter
-if(reporter)
-  set(reporter_arg "--reporter ${reporter}")
-endif()
-
-# Prepare output dir
-if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
-  set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
-  if(NOT EXISTS ${output_dir})
-    file(MAKE_DIRECTORY ${output_dir})
+foreach(TEST_EXECUTABLE ${TEST_EXE_LIST})
+  if(WIN32)
+    set(TEST_EXECUTABLE ${TEST_EXECUTABLE}.exe)
   endif()
-endif()
+  get_filename_component(TEST_EXECUTABLE ${TEST_EXECUTABLE} ABSOLUTE)
 
-# Parse output
-foreach(line ${output})
-  set(test ${line})
-  # Escape characters in test case names that would be parsed by Catch2
-  set(test_name ${test})
-  foreach(char , [ ])
-    string(REPLACE ${char} "\\${char}" test_name ${test_name})
-  endforeach(char)
-  # ...add output dir
-  if(output_dir)
-    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}")
+  # Run test executable to get list of available tests
+  if(NOT EXISTS "${TEST_EXECUTABLE}")
+    # exe does not exist moving to the next executable
+    continue()
+  endif()
+  execute_process(
+    COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-test-names-only
+    OUTPUT_VARIABLE output
+    RESULT_VARIABLE result
+    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+  )
+  # Catch --list-test-names-only reports the number of tests, so 0 is... surprising
+  if(${result} EQUAL 0)
+    message(WARNING
+      "Test executable '${TEST_EXECUTABLE}' contains no tests!\n"
+    )
+  elseif(${result} LESS 0)
+    message(FATAL_ERROR
+      "Error running test executable '${TEST_EXECUTABLE}':\n"
+      "  Result: ${result}\n"
+      "  Output: ${output}\n"
+    )
   endif()
 
-  file(RELATIVE_PATH exe_path ${CMAKE_CURRENT_BINARY_DIR} ${TEST_EXECUTABLE})
+  string(REPLACE "\n" ";" output "${output}")
 
-  # ...and add to script
-  add_command(add_test
-    "${prefix}${test}${suffix}"
-    ${TEST_EXECUTOR}
-    "${exe_path}"
-    "${test_name}"
-    ${extra_args}
-    "${reporter_arg}"
-    "${output_dir_arg}"
+  # Run test executable to get list of available reporters
+  execute_process(
+    COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
+    OUTPUT_VARIABLE reporters_output
+    RESULT_VARIABLE reporters_result
+    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
   )
-  add_command(set_tests_properties
-    "${prefix}${test}${suffix}"
-    PROPERTIES
-    ${properties}
-  )
-  list(APPEND tests "${prefix}${test}${suffix}")
+  if(${reporters_result} EQUAL 0)
+    message(WARNING
+      "Test executable '${TEST_EXECUTABLE}' contains no reporters!\n"
+    )
+  elseif(${reporters_result} LESS 0)
+    message(FATAL_ERROR
+      "Error running test executable '${TEST_EXECUTABLE}':\n"
+      "  Result: ${reporters_result}\n"
+      "  Output: ${reporters_output}\n"
+    )
+  endif()
+  string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
+  if(reporter AND ${reporter_is_valid} EQUAL -1)
+    message(FATAL_ERROR
+      "\"${reporter}\" is not a valid reporter!\n"
+    )
+  endif()
+
+  # Prepare reporter
+  if(reporter)
+    set(reporter_arg "--reporter ${reporter}")
+  endif()
+
+  # Prepare output dir
+  if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
+    set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
+    if(NOT EXISTS ${output_dir})
+      file(MAKE_DIRECTORY ${output_dir})
+    endif()
+  endif()
+
+  # Parse output
+  foreach(line ${output})
+    set(test ${line})
+    # Escape characters in test case names that would be parsed by Catch2
+    set(test_name ${test})
+    foreach(char , [ ])
+      string(REPLACE ${char} "\\${char}" test_name ${test_name})
+    endforeach(char)
+    # ...add output dir
+    if(output_dir)
+      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}
+      "${exe_path}"
+      "${test_name}"
+      ${extra_args}
+      "${reporter_arg}"
+      "${output_dir_arg}"
+    )
+    add_command(set_tests_properties
+      "${prefix}${test}${suffix}"
+      PROPERTIES
+      ${properties}
+    )
+    list(APPEND tests "${prefix}${test}${suffix}")
+  endforeach()
+
+  # Create a list of all discovered tests, which users may use to e.g. set
+  # properties on the tests
+  add_command(set ${TEST_LIST} ${tests})
+
 endforeach()
 
-# Create a list of all discovered tests, which users may use to e.g. set
-# properties on the tests
-add_command(set ${TEST_LIST} ${tests})
-
 # Write CTest script
-file(APPEND "${CTEST_FILE}" "${script}")
+file(WRITE "${CTEST_FILE}" "${script}")

projects/hip-tests/catch/external/Catch2/cmake/Catch2/catch_include.cmake

@@ -2,40 +2,29 @@
 # <submodule>_tests.cmake contains the add_test macro which runs the individual test.
 
 get_filename_component(_cmake_path cmake ABSOLUTE)
+execute_process(
+COMMAND "${_cmake_path}"
+        -D "TEST_TARGET=${TARGET}"
+        -D "TEST_EXE_LIST=${exc_names}"
+        -D "TEST_EXECUTOR=${crosscompiling_emulator}"
+        -D "TEST_WORKING_DIR=${_workdir}"
+        -D "TEST_SPEC=${_TEST_SPEC}"
+        -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
+        -D "TEST_PROPERTIES=${_PROPERTIES}"
+        -D "TEST_PREFIX=${_TEST_PREFIX}"
+        -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+        -D "TEST_LIST=${_TEST_LIST}"
+        -D "TEST_REPORTER=${_REPORTER}"
+        -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
+        -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
+        -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
+        -D "CTEST_FILE=${ctestfilepath}"
+        -P "${_CATCH_ADD_TEST_SCRIPT}"
+OUTPUT_VARIABLE output
+RESULT_VARIABLE result
+WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+)
 
-if(NOT EXISTS "${ctestfilepath}")
-  foreach(EXEC_NAME ${exc_names})
-    if(WIN32)
-      set(EXEC_NAME ${EXEC_NAME}.exe)
-    endif()
-    if(EXISTS "${EXEC_NAME}")
-      execute_process(
-      COMMAND "${_cmake_path}"
-              -D "TEST_TARGET=${TARGET}"
-              -D "TEST_EXECUTABLE=${EXEC_NAME}"
-              -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-              -D "TEST_WORKING_DIR=${_workdir}"
-              -D "TEST_SPEC=${_TEST_SPEC}"
-              -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-              -D "TEST_PROPERTIES=${_PROPERTIES}"
-              -D "TEST_PREFIX=${_TEST_PREFIX}"
-              -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-              -D "TEST_LIST=${_TEST_LIST}"
-              -D "TEST_REPORTER=${_REPORTER}"
-              -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
-              -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
-              -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
-              -D "CTEST_FILE=${ctestfilepath}"
-              -P "${_CATCH_ADD_TEST_SCRIPT}"
-      OUTPUT_VARIABLE output
-      RESULT_VARIABLE result
-      WORKING_DIRECTORY "${TEST_WORKING_DIR}"
-      )
-    else()
-      message("executable not found : ${EXEC_NAME}" )
-    endif()
-  endforeach()
-endif()
 
 if(EXISTS "${ctestfilepath}")
   # include the generated ctest file for execution