Skip to content

Remove inkevent dependency from records #11453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JosiahWI merged 2 commits into from
Jun 17, 2024
Merged

Remove inkevent dependency from records #11453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279c583
Remove inkevent dependency from records
JosiahWI Jun 15, 2024
e473afb
Fix logging test linking
JosiahWI Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/proxy/logging/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ target_link_libraries(logging PUBLIC ts::inkevent ts::inkutils ts::http ts::hdrs
if(BUILD_TESTING)
add_executable(test_LogUtils LogUtils.cc unit-tests/test_LogUtils.cc)
target_compile_definitions(test_LogUtils PRIVATE TEST_LOG_UTILS)
target_link_libraries(test_LogUtils tscore records catch2::catch2)
target_link_libraries(test_LogUtils tscore ts::inkevent records catch2::catch2)
add_test(NAME test_LogUtils COMMAND test_LogUtils)

add_executable(test_RolledLogDeleter LogUtils.cc RolledLogDeleter.cc unit-tests/test_LogUtils.cc)
target_compile_definitions(test_RolledLogDeleter PRIVATE TEST_LOG_UTILS)
target_link_libraries(test_RolledLogDeleter tscore records catch2::catch2)
target_link_libraries(test_RolledLogDeleter tscore ts::inkevent records catch2::catch2)
add_test(NAME test_RolledLogDeleter COMMAND test_RolledLogDeleter)
endif()

Expand Down
8 changes: 5 additions & 3 deletions src/records/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,19 @@ add_library(ts::records ALIAS records)

target_link_libraries(
records
PUBLIC ts::inkevent ts::tscore yaml-cpp::yaml-cpp
PUBLIC ts::tscore yaml-cpp::yaml-cpp
PRIVATE ts::tsutil
)

if(BUILD_TESTING)
add_executable(test_records unit_tests/unit_test_main.cc unit_tests/test_RecHttp.cc)
target_link_libraries(test_records PRIVATE records catch2::catch2 tscore libswoc::libswoc)
target_link_libraries(test_records PRIVATE records catch2::catch2 ts::tscore libswoc::libswoc)
add_test(NAME test_records COMMAND test_records)

add_executable(test_records_on_eventsystem unit_tests/unit_test_main_on_eventsystem.cc)
target_link_libraries(test_records_on_eventsystem PRIVATE records catch2::catch2 tscore libswoc::libswoc)
target_link_libraries(
test_records_on_eventsystem PRIVATE records catch2::catch2 ts::inkevent ts::tscore libswoc::libswoc
)
add_test(NAME test_records_on_eventsystem COMMAND test_records_on_eventsystem)
endif()

Expand Down