From 4a80ecbfb84e3804176fab2dd9f36d0a9d2b0c31 Mon Sep 17 00:00:00 2001
From: "Baraldi, Giovanni" <Giovanni.Baraldi@amd.com>
Date: Tue, 3 Dec 2024 21:00:36 +0100
Subject: [PATCH] Fix for tests. Fix for merge conflict in buffered_output.
 (#34)

* Fix for tests. Fix for merge conflict in buffered_output.

* Formatting

---------

Co-authored-by: Giovanni Baraldi <gbaraldi@amd.com>
---
 source/lib/output/buffered_output.hpp |  2 +-
 tests/thread-trace/CMakeLists.txt     | 36 +++++++--------------------
 2 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/source/lib/output/buffered_output.hpp b/source/lib/output/buffered_output.hpp
index e045c63d2a..992f40605b 100644
--- a/source/lib/output/buffered_output.hpp
+++ b/source/lib/output/buffered_output.hpp
@@ -158,6 +158,6 @@ using memory_allocation_buffered_output_t =
                     domain_type::MEMORY_ALLOCATION>;
 using counter_records_buffered_output_t =
     ::rocprofiler::tool::buffered_output<rocprofiler::tool::serialized_counter_record_t,
-                                         domain_type::COUNTER_COLLECTION>;
+                                         domain_type::COUNTER_VALUES>;
 }  // namespace tool
 }  // namespace rocprofiler
diff --git a/tests/thread-trace/CMakeLists.txt b/tests/thread-trace/CMakeLists.txt
index 7c86c14227..a44e42aa2f 100644
--- a/tests/thread-trace/CMakeLists.txt
+++ b/tests/thread-trace/CMakeLists.txt
@@ -119,20 +119,14 @@ target_sources(
 target_link_libraries(thread-trace-api-single-test
                       PRIVATE rocprofiler-sdk::rocprofiler-sdk amd_comgr dw)
 
-if(ROCPROFILER_MEMCHECK_PRELOAD_ENV)
-    set(PRELOAD_ENV
-        "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}:$<TARGET_FILE:thread-trace-api-single-test>")
-else()
-    set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:thread-trace-api-single-test>")
-endif()
-
 add_test(NAME thread-trace-api-single-test
          COMMAND $<TARGET_FILE:thread-trace-api-single-test>)
 
 set_tests_properties(
     thread-trace-api-single-test
-    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT "${PRELOAD_ENV}"
-               FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
+    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT
+               "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}" FAIL_REGULAR_EXPRESSION
+               "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
 
 # Multi dispatch test
 add_executable(thread-trace-api-multi-test)
@@ -142,20 +136,14 @@ target_sources(
 target_link_libraries(thread-trace-api-multi-test PRIVATE rocprofiler-sdk::rocprofiler-sdk
                                                           amd_comgr dw)
 
-if(ROCPROFILER_MEMCHECK_PRELOAD_ENV)
-    set(PRELOAD_ENV
-        "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}:$<TARGET_FILE:thread-trace-api-multi-test>")
-else()
-    set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:thread-trace-api-multi-test>")
-endif()
-
 add_test(NAME thread-trace-api-multi-test
          COMMAND $<TARGET_FILE:thread-trace-api-multi-test>)
 
 set_tests_properties(
     thread-trace-api-multi-test
-    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT "${PRELOAD_ENV}"
-               FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
+    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT
+               "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}" FAIL_REGULAR_EXPRESSION
+               "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
 
 # Agent profiling test
 add_executable(thread-trace-api-agent-test)
@@ -164,17 +152,11 @@ target_sources(thread-trace-api-agent-test PRIVATE agent_test.cpp)
 target_link_libraries(thread-trace-api-agent-test
                       PRIVATE rocprofiler-sdk::rocprofiler-sdk)
 
-if(ROCPROFILER_MEMCHECK_PRELOAD_ENV)
-    set(PRELOAD_ENV
-        "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}:$<TARGET_FILE:thread-trace-api-agent-test>")
-else()
-    set(PRELOAD_ENV "LD_PRELOAD=$<TARGET_FILE:thread-trace-api-agent-test>")
-endif()
-
 add_test(NAME thread-trace-api-agent-test
          COMMAND $<TARGET_FILE:thread-trace-api-agent-test>)
 
 set_tests_properties(
     thread-trace-api-agent-test
-    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT "${PRELOAD_ENV}"
-               FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
+    PROPERTIES TIMEOUT 10 LABELS "integration-tests" ENVIRONMENT
+               "${ROCPROFILER_MEMCHECK_PRELOAD_ENV}" FAIL_REGULAR_EXPRESSION
+               "${ROCPROFILER_DEFAULT_FAIL_REGEX}")