From e62b72ce2e1d5b57ae6157d0bbd4d9122dd6b3ee Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 3 May 2023 07:41:59 +0000 Subject: [PATCH 1/3] fix tests coredumper linking --- test/tap/tests/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile index eb4fe37a3..937f63086 100644 --- a/test/tap/tests/Makefile +++ b/test/tap/tests/Makefile @@ -61,6 +61,10 @@ CITYHASH_DIR=$(DEPS_PATH)/cityhash/cityhash/ CITYHASH_IDIR=$(CITYHASH_DIR) CITYHASH_LDIR=$(CITYHASH_DIR)/src/.libs +COREDUMPER_DIR=$(DEPS_PATH)/coredumper/coredumper +COREDUMPER_IDIR=$(COREDUMPER_DIR)/include +COREDUMPER_LDIR=$(COREDUMPER_DIR)/src + IDIR=../../../include LDIR=../../../lib TAP_LIBDIR=../tap @@ -76,9 +80,19 @@ OBJ=../../../src/obj/proxysql_global.o ../../../src/obj/main.o ../../../src/obj/ INCLUDEDIRS=-I../tap -I$(RE2_PATH) -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(SQLITE3_DIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(CURL_IDIR) -I$(DAEMONPATH_IDIR) -I$(MARIADB_IDIR) -I$(SSL_IDIR) -I$(JSON_IDIR) -I$(LIBCONFIG_IDIR) -I$(PROMETHEUS_IDIR) -I$(EV_IDIR) LDIRS=-L$(TAP_LIBDIR) -L$(LDIR) -L$(JEMALLOC_LDIR) $(LIBCONFIG_LDIR) -L$(RE2_PATH)/obj -L$(MARIADB_LDIR) -L$(DAEMONPATH_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(SSL_LDIR) -L$(PROMETHEUS_LDIR) +UNAME_S := $(shell uname -s) + +ifeq ($(UNAME_S),Linux) + LDIRS+= -L$(COREDUMPER_LDIR) +endif + MYLIBS=-Wl,--export-dynamic -Wl,-Bstatic -lconfig -lproxysql -ldaemon -ljemalloc -lconfig++ -lre2 -lpcrecpp -lpcre -lmariadbclient -lhttpserver -lmicrohttpd -linjection -lcurl -lssl -lcrypto -lev -Wl,-Bdynamic -lgnutls -lpthread -lm -lz -lrt $(EXTRALINK) -lprometheus-cpp-pull -lprometheus-cpp-core -luuid STATIC_LIBS= $(SSL_LDIR)/libssl.a $(SSL_LDIR)/libcrypto.a $(CITYHASH_LDIR)/libcityhash.a +ifeq ($(UNAME_S),Linux) + STATIC_LIBS+= $(COREDUMPER_LDIR)/libcoredumper.a +endif + .PHONY: all all: tests From 65fc79abe7d06de670372d8c948b4b4eaa29cee2 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 3 May 2023 07:43:28 +0000 Subject: [PATCH 2/3] fix tests spookyhash include --- test/tap/tap/SQLite3_Server.cpp | 1 - test/tap/tests/aurora.cpp | 1 - test/tap/tests/galera_1_timeout_count.cpp | 1 - test/tap/tests/galera_2_timeout_no_count.cpp | 1 - 4 files changed, 4 deletions(-) diff --git a/test/tap/tap/SQLite3_Server.cpp b/test/tap/tap/SQLite3_Server.cpp index bbd629683..27f2605f8 100644 --- a/test/tap/tap/SQLite3_Server.cpp +++ b/test/tap/tap/SQLite3_Server.cpp @@ -23,7 +23,6 @@ #include #include #include -#include "SpookyV2.h" #include #include diff --git a/test/tap/tests/aurora.cpp b/test/tap/tests/aurora.cpp index f35212e83..938009a2c 100644 --- a/test/tap/tests/aurora.cpp +++ b/test/tap/tests/aurora.cpp @@ -23,7 +23,6 @@ #include #include #include -#include "SpookyV2.h" #include #include diff --git a/test/tap/tests/galera_1_timeout_count.cpp b/test/tap/tests/galera_1_timeout_count.cpp index 45fbcaf9e..b7b3de970 100644 --- a/test/tap/tests/galera_1_timeout_count.cpp +++ b/test/tap/tests/galera_1_timeout_count.cpp @@ -23,7 +23,6 @@ #include #include #include -#include "SpookyV2.h" #include #include diff --git a/test/tap/tests/galera_2_timeout_no_count.cpp b/test/tap/tests/galera_2_timeout_no_count.cpp index 48eb78cb7..a380e4192 100644 --- a/test/tap/tests/galera_2_timeout_no_count.cpp +++ b/test/tap/tests/galera_2_timeout_no_count.cpp @@ -23,7 +23,6 @@ #include #include #include -#include "SpookyV2.h" #include #include From 4ba580702b934303ff0d0f84156a6a2732bf57f1 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 3 May 2023 07:45:22 +0000 Subject: [PATCH 3/3] fix tests dump_table_mysql_servers rename --- test/tap/tests/galera_1_timeout_count.cpp | 2 +- test/tap/tests/galera_2_timeout_no_count.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tap/tests/galera_1_timeout_count.cpp b/test/tap/tests/galera_1_timeout_count.cpp index b7b3de970..9426d4f94 100644 --- a/test/tap/tests/galera_1_timeout_count.cpp +++ b/test/tap/tests/galera_1_timeout_count.cpp @@ -252,7 +252,7 @@ void SQLite3_Server_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *p ok(actual_timeouts == num_timeouts, "Another timeout processed. Number expected timeouts is equal to number of actual timeouts. Expected [%d]. Actual [%d]", num_timeouts, actual_timeouts); auto max_timeouts = mysql_thread___monitor_galera_healthcheck_max_timeout_count; - std::unique_ptr rs = std::unique_ptr(MyHGM->dump_table_mysql_servers()); + std::unique_ptr rs = std::unique_ptr(MyHGM->dump_table_mysql("mysql_servers")); for (auto r : rs->rows) { if (!strcmp(r->fields[1], "127.1.1.11") && !strcmp(r->fields[0],"2274") && actual_timeouts == max_timeouts && num_timeouts == max_timeouts) { ok(true, "Number of max timeouts reached. Host goes offline. Max timeouts count %d, actual number of timeouts %d", max_timeouts, actual_timeouts); diff --git a/test/tap/tests/galera_2_timeout_no_count.cpp b/test/tap/tests/galera_2_timeout_no_count.cpp index a380e4192..0a64c86aa 100644 --- a/test/tap/tests/galera_2_timeout_no_count.cpp +++ b/test/tap/tests/galera_2_timeout_no_count.cpp @@ -265,7 +265,7 @@ void SQLite3_Server_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *p } delete rs1; - std::unique_ptr rs = std::unique_ptr(MyHGM->dump_table_mysql_servers()); + std::unique_ptr rs = std::unique_ptr(MyHGM->dump_table_mysql("mysql_servers")); for (auto r : rs->rows) { if (r->fields[0] && r->fields[1] && !strcmp(r->fields[1], "127.1.1.11") && strcmp(r->fields[0],"2274")) { ok(true, "Host stays online. Max timeouts count [%d], number of timeouts in a row [%d], generated timeouts [%d]", max_timeouts, actual_timeouts, num_timeouts);