From 5610865a87a14565276a5e9f5bab99f5a6b7ccfd Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Tue, 7 Feb 2023 05:44:18 +0530
Subject: [PATCH] SWDEV-380433 - catch tests avoid same test detection (#157)

fixes duplicate entry of tests in ctestfile

Change-Id: Ia3e213109272b296e93e7b98656b080426e6ebb3


[ROCm/hip-tests commit: 30d616d468e953588a66437d921572d1ad3cc0eb]
---
 .../Catch2/cmake/Catch2/catch_include.cmake   | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/projects/hip-tests/catch/external/Catch2/cmake/Catch2/catch_include.cmake b/projects/hip-tests/catch/external/Catch2/cmake/Catch2/catch_include.cmake
index b698e8b96c..9d37d62260 100644
--- a/projects/hip-tests/catch/external/Catch2/cmake/Catch2/catch_include.cmake
+++ b/projects/hip-tests/catch/external/Catch2/cmake/Catch2/catch_include.cmake
@@ -3,39 +3,41 @@
 
 get_filename_component(_cmake_path cmake ABSOLUTE)
 
-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()
+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
-include(${ctestfilepath})
+  # include the generated ctest file for execution
+  include(${ctestfilepath})
 endif()