From 6a75365f6df489e70a2a1dbd73f065fc902369f6 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Sun, 15 Jun 2025 09:33:19 +0000 Subject: [PATCH 1/5] Enhancement: Adjust binary file location (#535) Signed-off-by: Yadunand Kamath --- CMakeLists.txt | 2 ++ unittest/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f7d54903..1133c9d49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,8 @@ MESSAGE(STATUS "This is Project source dir " ${PROJECT_SOURCE_DIR}) MESSAGE(STATUS "This is PROJECT_BINARY_DIR dir " ${PROJECT_BINARY_DIR}) SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +SET(UNITTEST_OUTPUT_PATH ${PROJECT_BINARY_DIR}/unittest) + SET(CMAKE_PREFIX_PATH "${PROJECT_SOURCE_DIR}/deps/3rd/usr/local;/usr/local;${CMAKE_PREFIX_PATH}") SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 356a8ffcf..c7a56fe42 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -5,6 +5,8 @@ find_package(GTest CONFIG REQUIRED) include(GoogleTest) +SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH}) + ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(oblsm) From d67a28f1ab10f30cf0e9d5337292475fa8ee9c50 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Sun, 15 Jun 2025 11:06:38 +0000 Subject: [PATCH 2/5] Fix: memtracer CI fail Signed-off-by: Yadunand Kamath --- .github/workflows/test.yml | 4 ++-- benchmark/CMakeLists.txt | 3 +++ unittest/memtracer/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05aac8fd3..f10da3440 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -121,12 +121,12 @@ jobs: shell: bash run: | cd build_release - ${{matrix.memtracer}} ./bin/memtracer_performance_test + ${{matrix.memtracer}} ./unittest/memtracer_performance_test - name: memtracer-unittest shell: bash run: | cd build_release - LD_PRELOAD=./lib/libmemtracer.so ./bin/memtracer_test + LD_PRELOAD=./lib/libmemtracer.so ./unittest/memtracer_test - name: memtracer-sysbench shell: bash run: | diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index bf048eefa..b47a24c7b 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -12,5 +12,8 @@ FOREACH (F ${ALL_SRC}) if(NOT ${prjName} STREQUAL "memtracer_performance_test") TARGET_LINK_LIBRARIES(${prjName} observer_static oblsm) endif() + if(${prjName} STREQUAL "memtracer_performance_test") + SET_TARGET_PROPERTIES(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH}) + endif() ENDFOREACH (F) diff --git a/unittest/memtracer/CMakeLists.txt b/unittest/memtracer/CMakeLists.txt index 8048b2459..ac11bf96a 100644 --- a/unittest/memtracer/CMakeLists.txt +++ b/unittest/memtracer/CMakeLists.txt @@ -8,5 +8,6 @@ FOREACH (F ${ALL_SRC}) MESSAGE("Build ${prjName} according to ${F}") ADD_EXECUTABLE(${prjName} ${F}) TARGET_LINK_LIBRARIES(${prjName} pthread dl GTest::gtest_main memtracer) + set_target_properties(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH}) add_test(NAME ${prjName} COMMAND ${prjName}) ENDFOREACH (F) From 2fda77eb647ecd1f31ee7b6fb369684ed3ba653c Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Wed, 25 Jun 2025 09:52:48 +0000 Subject: [PATCH 3/5] Update: Adjust benchmark binaries location Signed-off-by: Yadunand Kamath --- .github/workflows/test.yml | 2 +- benchmark/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f10da3440..01beccb47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -121,7 +121,7 @@ jobs: shell: bash run: | cd build_release - ${{matrix.memtracer}} ./unittest/memtracer_performance_test + ${{matrix.memtracer}} ./benchmark/memtracer_performance_test - name: memtracer-unittest shell: bash run: | diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index b47a24c7b..984010573 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -12,8 +12,5 @@ FOREACH (F ${ALL_SRC}) if(NOT ${prjName} STREQUAL "memtracer_performance_test") TARGET_LINK_LIBRARIES(${prjName} observer_static oblsm) endif() - if(${prjName} STREQUAL "memtracer_performance_test") - SET_TARGET_PROPERTIES(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH}) - endif() - + SET_TARGET_PROPERTIES(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/benchmark) ENDFOREACH (F) From b28d86d13f92e57f132a4bcd80bfefa867e705a2 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Wed, 25 Jun 2025 10:59:56 +0000 Subject: [PATCH 4/5] Re-run CI Signed-off-by: Yadunand Kamath From 8a24d038c74885e172328823be261a9aa00de068 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Sat, 28 Jun 2025 06:37:36 +0000 Subject: [PATCH 5/5] Remove redundant line from unittest\memtracer\CMakeLists.txt Signed-off-by: Yadunand Kamath --- unittest/memtracer/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/unittest/memtracer/CMakeLists.txt b/unittest/memtracer/CMakeLists.txt index ac11bf96a..8048b2459 100644 --- a/unittest/memtracer/CMakeLists.txt +++ b/unittest/memtracer/CMakeLists.txt @@ -8,6 +8,5 @@ FOREACH (F ${ALL_SRC}) MESSAGE("Build ${prjName} according to ${F}") ADD_EXECUTABLE(${prjName} ${F}) TARGET_LINK_LIBRARIES(${prjName} pthread dl GTest::gtest_main memtracer) - set_target_properties(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${UNITTEST_OUTPUT_PATH}) add_test(NAME ${prjName} COMMAND ${prjName}) ENDFOREACH (F)