From 66bfeb420c972d68ee8f9b75647bb94dfa1b9216 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Sun, 20 Apr 2025 12:58:38 +0000 Subject: [PATCH 1/2] Enhancement: Adjust binary file location (#535) Signed-off-by: Yadunand Kamath --- CMakeLists.txt | 2 ++ src/obclient/CMakeLists.txt | 2 +- src/observer/CMakeLists.txt | 2 +- unittest/CMakeLists.txt | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fbab7837..1b6433fb0 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/src/obclient/CMakeLists.txt b/src/obclient/CMakeLists.txt index 09a31859b..dde669b89 100644 --- a/src/obclient/CMakeLists.txt +++ b/src/obclient/CMakeLists.txt @@ -27,4 +27,4 @@ TARGET_LINK_LIBRARIES(obclient common pthread dl) # Target 必须在定义 ADD_EXECUTABLE 之后， programs 不受这个限制 # TARGETS和PROGRAMS 的默认权限是OWNER_EXECUTE, GROUP_EXECUTE, 和WORLD_EXECUTE，即755权限， programs 都是处理脚步类 # 类型分为RUNTIME／LIBRARY／ARCHIVE, prog -INSTALL(TARGETS obclient RUNTIME DESTINATION bin) +INSTALL(TARGETS obclient RUNTIME DESTINATION ${EXECUTABLE_OUTPUT_PATH}) diff --git a/src/observer/CMakeLists.txt b/src/observer/CMakeLists.txt index 102699fd4..9bba526a2 100644 --- a/src/observer/CMakeLists.txt +++ b/src/observer/CMakeLists.txt @@ -60,5 +60,5 @@ TARGET_LINK_LIBRARIES(observer_static ${LIBRARIES} oblsm) # TARGETS和PROGRAMS 的默认权限是OWNER_EXECUTE, GROUP_EXECUTE, 和WORLD_EXECUTE，即755权限， programs 都是处理脚本类 # 类型分为RUNTIME／LIBRARY／ARCHIVE, prog INSTALL(TARGETS observer observer_static - RUNTIME DESTINATION bin + RUNTIME DESTINATION ${EXECUTABLE_OUTPUT_PATH} ARCHIVE DESTINATION lib) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index ccbaffeca..077f39552 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) IF (WITH_MEMTRACER) ADD_SUBDIRECTORY(memtracer) From 1028d4e059d3e7c5cf00d11bb930cc24cdedc351 Mon Sep 17 00:00:00 2001 From: Yadunand Kamath Date: Tue, 22 Apr 2025 06:51:06 +0000 Subject: [PATCH 2/2] Fix CI paths for memtracer tests after binary directory restructuring Signed-off-by: Yadunand Kamath --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5496031f2..87735a8a8 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: |