cmake: add tests for proxy/hdrs #10283
Conversation
|
|
||
| TEST_CASE("Huffmancode Random", "[proxy][huffman]") | ||
| { | ||
| // This doesn't check anything ... |
CMakeLists.txt
Outdated
| add_library(catch::catch INTERFACE IMPORTED) | ||
| target_include_directories(catch::catch INTERFACE ${CMAKE_SOURCE_DIR}/include ${CATCH_INCLUDE_DIR}) |
There was a problem hiding this comment.
I thought there was already a target? catch2::catch2 maybe? Their own official target last I checked is Catch2::Catch2WithMain, which we don't use (but maybe should for consistency).
There was a problem hiding this comment.
We vendor the catch header file so we don't use the find package. I just wanted the prettier way of getting the include 😄
There was a problem hiding this comment.
lib/CMakeLists.txt#L35-36
There was a problem hiding this comment.
oh, that's not in the convenient spot!
proxy/hdrs/CMakeLists.txt
Outdated
| unit_tests/unit_test_main.cc | ||
| ) | ||
| target_link_libraries(test_proxy_hdrs PRIVATE ts::hdrs ts::tscore ts::inkevent catch::catch) | ||
| add_test(NAME test_proxy_hdrs COMMAND $<TARGET_FILE:test_proxy_hdrs>) |
There was a problem hiding this comment.
Is the generator expression necessary? My understanding of the add_test docs was that if the command is the name of a target, it automatically uses that targets binary output.
There was a problem hiding this comment.
I don't think it is necessary but I was just following suit from other invocations of add_test
JosiahWI
left a comment
JosiahWI
left a comment
There was a problem hiding this comment.
I wonder whether it's possible to put all the hwloc stuff in one place instead of sprinkling conditional code around in multiple places.
| if(TS_USE_HWLOC) | ||
| target_link_libraries(traffic_layout PRIVATE hwloc::hwloc) | ||
| endif() | ||
|
|
There was a problem hiding this comment.
info.cc needs to get the API version from hwloc if it's enabled, so hwloc is a usage requirement.
|
|
||
| if(TS_USE_HWLOC) | ||
| target_link_libraries(inkevent PRIVATE hwloc::hwloc) | ||
| endif() |
There was a problem hiding this comment.
UnixEventProcessor.cc uses symbols from hwloc, so it is a usage requirement.
There was a problem hiding this comment.
I removed this because its pulled in transitively
There was a problem hiding this comment.
If the hwloc related code is that tightly coupled, it probably shouldn't be in 2 different components. If that's not the case, then imagine a scenario where we no longer need the hwloc code in tscore. Eventsystem will fail to compile, and the author will have to patch the inkevent CMakeLists as well, requiring a change in 2 places instead of 1.
| unit_tests/test_XPACK.cc | ||
| ) | ||
| target_include_directories(test_proxy_hdrs_xpack PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) | ||
| target_link_libraries(test_proxy_hdrs_xpack PRIVATE ts::tscore libswoc catch2::catch2) |
There was a problem hiding this comment.
Also depends on tscpputil. Doesn't depend on libswoc (that I can find).
There was a problem hiding this comment.
tscore needs libswoc but doesn't have it PUBLIC
There was a problem hiding this comment.
It almost certainly should be PUBLIC.
cmcfarlen
force-pushed
the
cmake-test-proxy-hdrs
branch
from
6447fb3 to
83b331c
Compare
src/traffic_layout/CMakeLists.txt
Outdated
|
|
||
| if(TS_USE_HWLOC) | ||
| target_link_libraries(traffic_layout PRIVATE hwloc::hwloc) | ||
| target_link_libraries(inkevent PRIVATE hwloc::hwloc) |
There was a problem hiding this comment.
Should be traffic_layout, not inkevent.
* asf/master: Make bad disk detection more robust (apache#10317) Update Proxy Verifier to v2.10.1 (apache#10322) Fix lua plugin build (apache#10319) cmake: Add support for building benchmarks (apache#10316) cmake: add tests for proxy/http3 (apache#10310) Cmake: Add tests in proxy/http proxy/http2 (apache#10305) add tests for src/records (apache#10302) cmake: add unit tests for proxy/logging (apache#10301) setup default install path, runtime user and group (apache#10299) cmake: add tests for proxy/hdrs (apache#10283) Fix ip_allow optional methods specification (apache#10246) Plugin promotions, deprecations and deletions (apache#10303) Use Dbg() for debug output in both core and plugins. (apache#9732) Remove in_addr forward declaration from experimental.h. (apache#10309)
3 participants
This also simplifies linking hwloc