From fa08918b4891892e125d021e9c09ee1bacd6b67e Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 11 Nov 2022 13:44:33 +0000 Subject: [PATCH] Don't recompile objects for tests (in Makefile tests) --- Makefile | 2 +- test/unit/CMakeLists.txt | 6 +- test/unit/Makefile | 257 +++++++++++++++++++------------- test/unit/bridge_topic_test.c | 3 - test/unit/persist_read_stubs.c | 7 +- test/unit/persist_read_test.c | 3 - test/unit/persist_write_stubs.c | 61 +++++++- test/unit/persist_write_test.c | 3 - test/unit/stubs.c | 12 ++ test/unit/subs_stubs.c | 18 ++- test/unit/subs_test.c | 3 - 11 files changed, 250 insertions(+), 125 deletions(-) diff --git a/Makefile b/Makefile index 9fe6caa7..6251b206 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ copy : sign scp ChangeLog.txt mosquitto:site/mosquitto.org/ coverage : - lcov --capture --directory . --output-file coverage.info --no-external + lcov --capture -d apps -d client -d common -d lib -d plugins -d src --output-file coverage.info --no-external genhtml coverage.info --output-directory out localdocker : reallyclean diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 71a61b77..9ea069c4 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -56,6 +56,7 @@ add_executable(bridge-topic-test ../../src/memory_public.c ../../lib/util_topic.c ) +target_compile_definitions(bridge-topic-test PRIVATE WITH_BRIDGE WITH_BROKER) target_link_libraries(bridge-topic-test PRIVATE bridge-topic-obj common-unit-test-header) add_test(NAME unit-bridge-topic-test COMMAND bridge-topic-test) @@ -91,7 +92,7 @@ add_executable(persist-read-test ../../lib/util_mosq.c ../../src/memory_public.c ) -target_compile_definitions(persist-read-test PRIVATE TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") +target_compile_definitions(persist-read-test PRIVATE TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" WITH_PERSISTENCE WITH_BROKER) target_link_libraries(persist-read-test PRIVATE persistence-read-obj) add_test(NAME unit-persist-read-test COMMAND persist-read-test) @@ -123,7 +124,7 @@ add_executable(persist-write-test ../../src/memory_public.c ../../lib/packet_mosq.c ) -target_compile_definitions(persist-write-test PRIVATE TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") +target_compile_definitions(persist-write-test PRIVATE TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" WITH_PERSISTENCE WITH_BROKER) target_link_libraries(persist-write-test PRIVATE persistence-write-obj OpenSSL::SSL) add_test(NAME unit-persist-write-test COMMAND persist-write-test) @@ -147,5 +148,6 @@ add_executable(subs-test ../../src/memory_public.c ) +target_compile_definitions(subs-test PRIVATE WITH_PERSISTENCE WITH_BROKER) target_link_libraries(subs-test PRIVATE common-unit-test-header persistence-obj) add_test(NAME unit-subs-test COMMAND subs-test) diff --git a/test/unit/Makefile b/test/unit/Makefile index 8624598e..22ab7f72 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -8,103 +8,107 @@ ifeq ($(WITH_BUNDLED_DEPS),yes) CPPFLAGS:=$(CPPFLAGS) -I${R}/deps endif -CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb -D TEST_SOURCE_DIR='"$(realpath .)"' +CFLAGS:=$(CFLAGS) -Wall -ggdb -D TEST_SOURCE_DIR='"$(realpath .)"' -coverage LDFLAGS:=$(LDFLAGS) -coverage LDADD:=$(LDADD) -lcunit +ifeq ($(WITH_TLS),yes) + LDADD:=$(LDADD) -lssl -lcrypto +endif -TEST_OBJS = test.o \ - datatype_read.o \ - datatype_write.o \ - misc_trim_test.o \ - property_add.o \ - property_read.o \ - property_user_read.o \ - property_write.o \ - stubs.o \ - util_topic_test.o \ - utf8.o - -LIB_OBJS = memory_mosq.o \ - memory_public.o \ - misc_mosq.o \ - packet_datatypes.o \ - packet_mosq.o \ - property_mosq.o \ - util_mosq.o \ - util_topic.o \ - utf8_mosq.o +TEST_OBJS = \ + test.o \ + datatype_read.o \ + datatype_write.o \ + misc_trim_test.o \ + property_add.o \ + property_read.o \ + property_user_read.o \ + property_write.o \ + lib_stubs.o \ + util_topic_test.o \ + utf8.o + +LIB_OBJS = \ + ${R}/lib/memory_mosq.o \ + ${R}/lib/misc_mosq.o \ + ${R}/lib/packet_datatypes.o \ + ${R}/lib/packet_mosq.o \ + ${R}/lib/property_mosq.o \ + ${R}/lib/util_mosq.o \ + ${R}/lib/util_topic.o \ + ${R}/lib/utf8_mosq.o BRIDGE_TOPIC_TEST_OBJS = \ bridge_topic_test.o \ - stubs.o \ + broker_stubs.o \ BRIDGE_TOPIC_OBJS = \ - bridge_topic.o \ - memory_mosq.o \ - memory_public.o \ - util_topic.o \ + ${R}/src/bridge_topic.o \ + ${R}/src/memory_mosq.o \ + ${R}/src/memory_public.o \ + ${R}/src/util_topic.o \ KEEPALIVE_TEST_OBJS = \ keepalive_stubs.o \ keepalive_test.o KEEPALIVE_OBJS = \ - memory_mosq.o + ${R}/src/memory_mosq.o PERSIST_READ_TEST_OBJS = \ persist_read_test.o \ persist_read_stubs.o PERSIST_READ_OBJS = \ - memory_mosq.o \ - memory_public.o \ - misc_mosq.o \ - packet_datatypes.o \ - persist_read.o \ - persist_read_v234.o \ - persist_read_v5.o \ - property_mosq.o \ - retain.o \ - topic_tok.o \ - utf8_mosq.o \ - util_mosq.o + ${R}/src/memory_mosq.o \ + ${R}/src/memory_public.o \ + ${R}/src/misc_mosq.o \ + ${R}/src/packet_datatypes.o \ + ${R}/src/persist_read.o \ + ${R}/src/persist_read_v234.o \ + ${R}/src/persist_read_v5.o \ + ${R}/src/property_mosq.o \ + ${R}/src/retain.o \ + ${R}/src/topic_tok.o \ + ${R}/src/utf8_mosq.o \ + ${R}/src/util_mosq.o PERSIST_WRITE_TEST_OBJS = \ persist_write_test.o \ persist_write_stubs.o PERSIST_WRITE_OBJS = \ - database.o \ - memory_mosq.o \ - memory_public.o \ - misc_mosq.o \ - packet_datatypes.o \ - packet_mosq.o \ - persist_read.o \ - persist_read_v234.o \ - persist_read_v5.o \ - persist_write.o \ - persist_write_v5.o \ - property_mosq.o \ - retain.o \ - subs.o \ - topic_tok.o \ - utf8_mosq.o \ - util_mosq.o + ${R}/src/database.o \ + ${R}/src/memory_mosq.o \ + ${R}/src/memory_public.o \ + ${R}/src/misc_mosq.o \ + ${R}/src/packet_datatypes.o \ + ${R}/src/packet_mosq.o \ + ${R}/src/persist_read.o \ + ${R}/src/persist_read_v234.o \ + ${R}/src/persist_read_v5.o \ + ${R}/src/persist_write.o \ + ${R}/src/persist_write_v5.o \ + ${R}/src/property_mosq.o \ + ${R}/src/retain.o \ + ${R}/src/subs.o \ + ${R}/src/topic_tok.o \ + ${R}/src/utf8_mosq.o \ + ${R}/src/util_mosq.o SUBS_TEST_OBJS = \ subs_test.o \ subs_stubs.o SUBS_OBJS = \ - database.o \ - memory_mosq.o \ - memory_public.o \ - packet_datatypes.o \ - property_mosq.o \ - subs.o \ - topic_tok.o \ - utf8_mosq.o \ + ${R}/src/database.o \ + ${R}/src/memory_mosq.o \ + ${R}/src/memory_public.o \ + ${R}/src/packet_datatypes.o \ + ${R}/src/property_mosq.o \ + ${R}/src/subs.o \ + ${R}/src/topic_tok.o \ + ${R}/src/utf8_mosq.o \ all : test-compile @@ -128,63 +132,110 @@ persist_write_test : ${PERSIST_WRITE_TEST_OBJS} ${PERSIST_WRITE_OBJS} subs_test : ${SUBS_TEST_OBJS} ${SUBS_OBJS} $(CROSS_COMPILE)$(CC) $(LDFLAGS) -o $@ $^ $(LDADD) +bridge_topic_test.o : bridge_topic_test.c + ${CROSS_COMPILE}${CC} -I${R}/src $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +broker_stubs.o : stubs.c + ${CROSS_COMPILE}${CC} $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +lib_stubs.o : stubs.c + ${CROSS_COMPILE}$(CC) $(LIB_CPPFLAGS) $(LIB_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +persist_read_test.o : persist_read_test.c + ${CROSS_COMPILE}${CC} -I${R}/test $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +persist_read_stubs.o: persist_read_stubs.c + ${CROSS_COMPILE}${CC} -I${R}/src $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +persist_write_test.o : persist_write_test.c + ${CROSS_COMPILE}${CC} -I${R}/test $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +persist_write_stubs.o: persist_write_stubs.c + ${CROSS_COMPILE}${CC} -I${R}/src $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +subs_test.o : subs_test.c + ${CROSS_COMPILE}${CC} -I${R}/test $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +subs_stubs.o: subs_stubs.c + ${CROSS_COMPILE}${CC} -I${R}/src $(BROKER_CPPFLAGS) $(BROKER_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ + +${R}/src/bridge_topic.o : ${R}/src/bridge_topic.c + $(MAKE) -C ${R}/src/ bridge_topic.o + +${R}/src/database.o : ${R}/src/database.c + $(MAKE) -C ${R}/src/ database.o + +${R}/lib/memory_mosq.o : ${R}/lib/memory_mosq.c + $(MAKE) -C ${R}/lib/ memory_mosq.o + +${R}/src/memory_mosq.o : ${R}/lib/memory_mosq.c + $(MAKE) -C ${R}/src/ memory_mosq.o + +${R}/src/memory_public.o : ${R}/src/memory_public.c + $(MAKE) -C ${R}/src/ memory_public.o + +${R}/lib/misc_mosq.o : ${R}/common/misc_mosq.c ${R}/common/misc_mosq.h + $(MAKE) -C ${R}/lib/ misc_mosq.o + +${R}/src/misc_mosq.o : ${R}/common/misc_mosq.c ${R}/common/misc_mosq.h + $(MAKE) -C ${R}/src/ misc_mosq.o -bridge_topic.o : ${R}/src/bridge_topic.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_BRIDGE -c -o $@ $^ +${R}/lib/packet_datatypes.o : ${R}/lib/packet_datatypes.c + $(MAKE) -C ${R}/lib/ packet_datatypes.o -database.o : ${R}/src/database.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/packet_datatypes.o : ${R}/lib/packet_datatypes.c + $(MAKE) -C ${R}/src/ packet_datatypes.o -memory_mosq.o : ${R}/lib/memory_mosq.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/packet_mosq.o : ${R}/lib/packet_mosq.c + $(MAKE) -C ${R}/src/ packet_mosq.o -memory_public.o : ${R}/src/memory_public.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/persist_read.o : ${R}/src/persist_read.c + $(MAKE) -C ${R}/src/ persist_read.o -misc_mosq.o : ${R}/common/misc_mosq.c ${R}/common/misc_mosq.h - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< +${R}/src/persist_read_v234.o : ${R}/src/persist_read_v234.c + $(MAKE) -C ${R}/src/ persist_read_v234.o -packet_datatypes.o : ${R}/lib/packet_datatypes.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/persist_read_v5.o : ${R}/src/persist_read_v5.c + $(MAKE) -C ${R}/src/ persist_read_v5.o -packet_mosq.o : ${R}/lib/packet_mosq.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/persist_write.o : ${R}/src/persist_write.c + $(MAKE) -C ${R}/src/ persist_write.o -persist_read.o : ${R}/src/persist_read.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/persist_write_v5.o : ${R}/src/persist_write_v5.c + $(MAKE) -C ${R}/src/ persist_write_v5.o -persist_read_v234.o : ${R}/src/persist_read_v234.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/lib/property_mosq.o : ${R}/lib/property_mosq.c + $(MAKE) -C ${R}/lib/ property_mosq.o -persist_read_v5.o : ${R}/src/persist_read_v5.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/property_mosq.o : ${R}/lib/property_mosq.c + $(MAKE) -C ${R}/src/ property_mosq.o -persist_write.o : ${R}/src/persist_write.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/retain.o : ${R}/src/retain.c + $(MAKE) -C ${R}/src/ retain.o -persist_write_v5.o : ${R}/src/persist_write_v5.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/subs.o : ${R}/src/subs.c + $(MAKE) -C ${R}/src/ subs.o -property_mosq.o : ${R}/lib/property_mosq.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/topic_tok.o : ${R}/src/topic_tok.c + $(MAKE) -C ${R}/src/ topic_tok.o -retain.o : ${R}/src/retain.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/lib/util_mosq.o : ${R}/lib/util_mosq.c + $(MAKE) -C ${R}/lib/ util_mosq.o -subs.o : ${R}/src/subs.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/src/util_mosq.o : ${R}/lib/util_mosq.c + $(MAKE) -C ${R}/src/ util_mosq.o -topic_tok.o : ${R}/src/topic_tok.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -DWITH_BROKER -DWITH_PERSISTENCE -c -o $@ $^ +${R}/lib/util_topic.o : ${R}/lib/util_topic.c + $(MAKE) -C ${R}/lib/ util_topic.o -util_mosq.o : ${R}/lib/util_mosq.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/util_topic.o : ${R}/lib/util_topic.c + $(MAKE) -C ${R}/src/ util_topic.o -util_topic.o : ${R}/lib/util_topic.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/lib/utf8_mosq.o : ${R}/lib/utf8_mosq.c + $(MAKE) -C ${R}/lib/ utf8_mosq.o -utf8_mosq.o : ${R}/lib/utf8_mosq.c - $(CROSS_COMPILE)$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ +${R}/src/utf8_mosq.o : ${R}/lib/utf8_mosq.c + $(MAKE) -C ${R}/src/ utf8_mosq.o build : mosq_test bridge_topic_test keepalive_test persist_read_test persist_write_test subs_test diff --git a/test/unit/bridge_topic_test.c b/test/unit/bridge_topic_test.c index 572fb41e..a0c682af 100644 --- a/test/unit/bridge_topic_test.c +++ b/test/unit/bridge_topic_test.c @@ -4,9 +4,6 @@ #include #include -#define WITH_BRIDGE -#define WITH_BROKER - #include "mosquitto_broker_internal.h" #include "property_mosq.h" #include "packet_mosq.h" diff --git a/test/unit/persist_read_stubs.c b/test/unit/persist_read_stubs.c index e6cac3b1..d73ae7b3 100644 --- a/test/unit/persist_read_stubs.c +++ b/test/unit/persist_read_stubs.c @@ -1,7 +1,5 @@ #include -#define WITH_BROKER - #include #include #include @@ -226,6 +224,11 @@ void context__add_to_by_id(struct mosquitto *context) } } +void context__send_will(struct mosquitto *context) +{ + UNUSED(context); +} + void plugin_persist__handle_retain_msg_set(struct mosquitto_base_msg *msg) { UNUSED(msg); diff --git a/test/unit/persist_read_test.c b/test/unit/persist_read_test.c index 21cf039d..66550878 100644 --- a/test/unit/persist_read_test.c +++ b/test/unit/persist_read_test.c @@ -7,9 +7,6 @@ #include #include "path_helper.h" -#define WITH_BROKER -#define WITH_PERSISTENCE - #include "mosquitto_broker_internal.h" #include "persist.h" #include "property_mosq.h" diff --git a/test/unit/persist_write_stubs.c b/test/unit/persist_write_stubs.c index 639a3c6e..826d5a89 100644 --- a/test/unit/persist_write_stubs.c +++ b/test/unit/persist_write_stubs.c @@ -1,7 +1,5 @@ #include -#define WITH_BROKER - #include #include #include @@ -10,6 +8,21 @@ #include #include +uint64_t g_bytes_received; +uint64_t g_bytes_sent; +uint64_t g_pub_bytes_received; +uint64_t g_pub_bytes_sent; +int64_t g_out_packet_bytes; +unsigned long g_msgs_received; +unsigned long g_msgs_sent; +unsigned long g_pub_msgs_received; +unsigned long g_pub_msgs_sent; +unsigned long g_msgs_dropped; +long g_out_packet_count; +unsigned int g_clients_expired; +unsigned int g_socket_connections; +unsigned int g_connection_count; + extern uint64_t last_retained; extern char *last_sub; extern int last_qos; @@ -170,6 +183,12 @@ void context__add_to_by_id(struct mosquitto *context) HASH_ADD_KEYPTR(hh_id, db.contexts_by_id, context->id, strlen(context->id), context); } } + +void context__send_will(struct mosquitto *context) +{ + UNUSED(context); +} + void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto_client_msg *cmsg) { UNUSED(context); @@ -235,3 +254,41 @@ void mosquitto_log_printf(int level, const char *fmt, ...) UNUSED(level); UNUSED(fmt); } + +int keepalive__update(struct mosquitto *context) +{ + UNUSED(context); + return 0; +} + +int mux__add_out(struct mosquitto *context) +{ + UNUSED(context); + return 0; +} +int mux__remove_out(struct mosquitto *context) +{ + UNUSED(context); + return 0; +} +ssize_t net__read_ws(struct mosquitto *mosq, void *buf, size_t count) +{ + UNUSED(mosq); + UNUSED(buf); + UNUSED(count); + return 0; +} + +void ws__prepare_packet(struct mosquitto *mosq, struct mosquitto__packet *packet) +{ + UNUSED(mosq); + UNUSED(packet); +} + +int send__disconnect(struct mosquitto *mosq, uint8_t reason_code, const mosquitto_property *properties) +{ + UNUSED(mosq); + UNUSED(reason_code); + UNUSED(properties); + return 0; +} diff --git a/test/unit/persist_write_test.c b/test/unit/persist_write_test.c index 8858c4b5..2fe93f98 100644 --- a/test/unit/persist_write_test.c +++ b/test/unit/persist_write_test.c @@ -7,9 +7,6 @@ #include #include "path_helper.h" -#define WITH_BROKER -#define WITH_PERSISTENCE - #include "mosquitto_broker_internal.h" #include "persist.h" diff --git a/test/unit/stubs.c b/test/unit/stubs.c index 5229d491..60bbd8fa 100644 --- a/test/unit/stubs.c +++ b/test/unit/stubs.c @@ -115,3 +115,15 @@ void plugin_persist__queue_retain_event(struct mosquitto_base_msg *msg, int even UNUSED(msg); UNUSED(event); } +void ws__prepare_packet(struct mosquitto *mosq, struct mosquitto__packet *packet) +{ + UNUSED(mosq); + UNUSED(packet); +} +ssize_t net__read_ws(struct mosquitto *mosq, void *buf, size_t count) +{ + UNUSED(mosq); + UNUSED(buf); + UNUSED(count); + return 0; +} diff --git a/test/unit/subs_stubs.c b/test/unit/subs_stubs.c index 9152d94c..64bd8a16 100644 --- a/test/unit/subs_stubs.c +++ b/test/unit/subs_stubs.c @@ -1,8 +1,5 @@ #include -#define WITH_BROKER -#define WITH_PERSISTENCE - #include #include #include @@ -13,6 +10,21 @@ #include #include +uint64_t g_bytes_received; +uint64_t g_bytes_sent; +uint64_t g_pub_bytes_received; +uint64_t g_pub_bytes_sent; +int64_t g_out_packet_bytes; +unsigned long g_msgs_received; +unsigned long g_msgs_sent; +unsigned long g_pub_msgs_received; +unsigned long g_pub_msgs_sent; +unsigned long g_msgs_dropped; +long g_out_packet_count; +unsigned int g_clients_expired; +unsigned int g_socket_connections; +unsigned int g_connection_count; + int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, ...) { UNUSED(mosq); diff --git a/test/unit/subs_test.c b/test/unit/subs_test.c index dcb538f1..fd971861 100644 --- a/test/unit/subs_test.c +++ b/test/unit/subs_test.c @@ -6,9 +6,6 @@ #include #include -#define WITH_BROKER -#define WITH_PERSISTENCE - #include "mosquitto_broker_internal.h" #include "memory_mosq.h"