From 6422b94204ff97aaf8973b8dffcb350b60966448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jaramago=20Fern=C3=A1ndez?= Date: Wed, 30 Nov 2022 16:12:31 +0100 Subject: [PATCH] Fix Makefile target dependencies and paths for 'deprecate_eof_support' tests --- .../deprecate_eof_support/Makefile | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/test/tap/tests_with_deps/deprecate_eof_support/Makefile b/test/tap/tests_with_deps/deprecate_eof_support/Makefile index fff82cad4..de34b5c56 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/Makefile +++ b/test/tap/tests_with_deps/deprecate_eof_support/Makefile @@ -1,28 +1,33 @@ include ../common_defs.Makefile -MARIADB_TEST_DEP=$(TEST_DEPS)/mariadb-client-library/mariadb-connector-c -FOUND_DEPS := $(shell if [ -d $(MARIADB_TEST_DEP) ]; then echo 1; else echo 0; fi) +MARIADB_BASE_FOLDER=$(TEST_DEPS)/mariadb-client-library-3.1.9/ +MARIADB_TEST_DEP=$(TEST_DEPS)/mariadb-client-library-3.1.9/mariadb-connector-c +FOUND_DEPS := $(shell if [ -d $(MARIADB_BASE_FOLDER) ]; then echo 1; else echo 0; fi) ifeq ($(FOUND_DEPS), 1) .PHONY: all all: build_deps tests -.PHONY: build_deps -build_deps: - cd $(MARIADB_TEST_DEP) && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient - OPT=-O2 $(WGCOV) -Wl,--no-as-needed + +.PHONY: debug debug: OPT=-O0 -DDEBUG -ggdb -Wl,--no-as-needed $(WGCOV) $(WASAN) debug: build_deps tests +$(MARIADB_TEST_DEP)/libmariadb/libmariadbclient.a: + cd $(MARIADB_BASE_FOLDER) && CC=${CC} CXX=${CXX} ${MAKE} mariadb_client + +.PHONY: build_deps +build_deps: $(MARIADB_TEST_DEP)/libmariadb/libmariadbclient.a + .PHONY: clean clean: rm -f *-t rm -f fwd_eof_query rm -f fwd_eof_ok_query rm -f *.a *.o - cd $(MARIADB_TEST_DEP) && ${MAKE} clean + cd $(MARIADB_BASE_FOLDER) && ${MAKE} clean WITHGCOVVAR := $(shell echo $(WITHGCOV)) ifeq ($(WITHGCOVVAR),1) @@ -38,37 +43,39 @@ else WASAN= endif -tests: build_deps $(patsubst %.cpp,%,$(wildcard *-t.cpp)) fwd_eof_query fwd_eof_ok_query +TESTS_DEPS=$(TAP_LIBDIR)/libtap.a $(MARIADB_TEST_DEP)/libmariadb/libmariadbclient.a + +tests: $(patsubst %.cpp,%,$(wildcard *-t.cpp)) fwd_eof_query fwd_eof_ok_query -ok_packet_mixed_queries-t: eof_packet_mixed_queries-t.cpp $(TAP_LIBDIR)/libtap.a build_deps +ok_packet_mixed_queries-t: eof_packet_mixed_queries-t.cpp $(TESTS_DEPS) $(CXX) -DDEBUG eof_packet_mixed_queries-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -I$(TAP_LIBDIR) -L$(TAP_LIBDIR) -ltap $(MYLIBS) -Wl,--no-as-needed -ldl -lpthread -o ok_packet_mixed_queries-t -DGITVERSION=\"$(GIT_VERSION)\" -eof_packet_mixed_queries-t: ok_packet_mixed_queries-t $(TAP_LIBDIR)/libtap.a build_deps +eof_packet_mixed_queries-t: ok_packet_mixed_queries-t $(TESTS_DEPS) $(CXX) -DNON_EOF_SUPPORT -DDEBUG eof_packet_mixed_queries-t.cpp -std=c++11 -I$(TAP_LIBDIR) -I $(MARIADB_TEST_DEP)/include/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L $(MARIADB_TEST_DEP)/libmariadb -L$(SSL_LDIR) $(OPT) -ltap $(MYLIBS) -ldl -o eof_packet_mixed_queries-t -DGITVERSION=\"$(GIT_VERSION)\" -fwd_eof_query: fwd_eof_query.cpp $(TAP_LIBDIR)/libtap.a build_deps +fwd_eof_query: fwd_eof_query.cpp $(TESTS_DEPS) $(CXX) -DNON_EOF_SUPPORT -DDEBUG fwd_eof_query.cpp $(OPT) -std=c++11 -I$(JSON_IDIR) -I$(TAP_LIBDIR) -I $(MARIADB_TEST_DEP)/include/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L $(MARIADB_TEST_DEP)/libmariadb $(MYLIBS) -L$(SSL_LDIR) -ltap -ldl -o fwd_eof_query -DGITVERSION=\"$(GIT_VERSION)\" -fwd_eof_ok_query: fwd_eof_query.cpp $(TAP_LIBDIR)/libtap.a build_deps +fwd_eof_ok_query: fwd_eof_query.cpp $(TESTS_DEPS) $(CXX) -DDEBUG fwd_eof_query.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -I$(TAP_LIBDIR) -L$(TAP_LIBDIR) $(MYLIBS) -L$(SSL_LDIR) -ltap -Wl,--no-as-needed -ldl -lpthread -o fwd_eof_ok_query -DGITVERSION=\"$(GIT_VERSION)\" # NOTE: Compilation with 'libmysql' instead of 'libmariadb' client to confirm packet sequence id isn't check by 'libmariadb' # fwd_eof_ok_query: fwd_eof_ok_query.cpp $(TAP_LIBDIR)/libtap.a # $(CXX) -DDEBUG fwd_eof_ok_query.cpp $(OPT) -std=c++11 -I$(JSON_IDIR) -I$(TAP_LIBDIR) -I /usr/include/mysql/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L /usr/lib/x86_64-linux-gnu/ -lmysqlclient -ltap -ldl -o fwd_eof_ok_query -DGITVERSION=\"$(GIT_VERSION)\" -deprecate_eof_cache-t: deprecate_eof_cache-t.cpp $(TAP_LIBDIR)/libtap.a $(LIBPROXYSQLAR) build_deps +deprecate_eof_cache-t: deprecate_eof_cache-t.cpp $(TESTS_DEPS) $(CXX) -DDEBUG deprecate_eof_cache-t.cpp $(OPT) -std=c++11 -I$(JSON_IDIR) -I$(TAP_LIBDIR) -I $(MARIADB_TEST_DEP)/include/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L$(MARIADB_TEST_DEP)/libmariadb -L$(SSL_LDIR) -L$(PROXYLDIR) -ltap $(MYLIBS) -lproxysql -ldl -o deprecate_eof_cache-t -DGITVERSION=\"$(GIT_VERSION)\" -eof_cache_mixed_flags-t: eof_cache_mixed_flags-t.cpp $(TAP_LIBDIR)/libtap.a build_deps +eof_cache_mixed_flags-t: eof_cache_mixed_flags-t.cpp $(TESTS_DEPS) $(CXX) -DDEBUG eof_cache_mixed_flags-t.cpp $(OPT) -std=c++11 -I$(JSON_IDIR) -I$(TAP_LIBDIR) -I $(MARIADB_TEST_DEP)/include/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L $(MARIADB_TEST_DEP)/libmariadb -L$(SSL_LDIR) -ltap $(MYLIBS) -ldl -o eof_cache_mixed_flags-t -DGITVERSION=\"$(GIT_VERSION)\" -eof_mixed_flags_queries-t: eof_mixed_flags_queries-t.cpp $(TAP_LIBDIR)/libtap.a build_deps +eof_mixed_flags_queries-t: eof_mixed_flags_queries-t.cpp $(TESTS_DEPS) $(CXX) -DDEBUG eof_mixed_flags_queries-t.cpp $(OPT) -std=c++11 -I$(JSON_IDIR) -I$(TAP_LIBDIR) -I $(MARIADB_TEST_DEP)/include/ -I $(IDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) -L $(MARIADB_TEST_DEP)/libmariadb -L$(SSL_LDIR) -ltap $(MYLIBS) -ldl -o eof_mixed_flags_queries-t -DGITVERSION=\"$(GIT_VERSION)\" -eof_conn_options_check-t: eof_conn_options_check-t.cpp $(TAP_LIBDIR)/libtap.a build_deps - $(CXX) -DDEBUG $(OPT) eof_conn_options_check-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -I$(TAP_LIBDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) $(MYLIBS) -ltap -Wl,--no-as-needed -ldl -lpthread -o eof_conn_options_check-t -DGITVERSION=\"$(GIT_VERSION)\" +eof_conn_options_check-t: eof_conn_options_check-t.cpp $(TESTS_DEPS) + $(CXX) -DDEBUG eof_conn_options_check-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -I$(TAP_LIBDIR) -L$(TAP_LIBDIR) -L$(TAP_DEPS_LIBS) $(MYLIBS) -ltap -Wl,--no-as-needed -ldl -lpthread -o eof_conn_options_check-t -DGITVERSION=\"$(GIT_VERSION)\" -eof_fast_forward-t: eof_fast_forward-t.cpp $(TAP_LIBDIR)/libtap.a $(LIBPROXYSQLAR) build_deps +eof_fast_forward-t: eof_fast_forward-t.cpp $(TESTS_DEPS) $(CXX) -DDEBUG eof_fast_forward-t.cpp $(INCLUDEDIRS) $(LDIRS) $(OPT) -std=c++11 -I$(TAP_LIBDIR) -L$(TAP_LIBDIR) -ltap $(MYLIBS) -Wl,--no-as-needed -ldl -lpthread -o eof_fast_forward-t -DGITVERSION=\"$(GIT_VERSION)\" else