diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05aac8fd3..01beccb47 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}} ./benchmark/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/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/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index bf048eefa..984010573 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -12,5 +12,5 @@ FOREACH (F ${ALL_SRC}) if(NOT ${prjName} STREQUAL "memtracer_performance_test") TARGET_LINK_LIBRARIES(${prjName} observer_static oblsm) endif() - + SET_TARGET_PROPERTIES(${prjName} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/benchmark) ENDFOREACH (F) 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)