From 08e7d44fc4a31c2f3397c9ddff7ab780d1583012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 3 Feb 2025 11:52:30 +0000 Subject: [PATCH] Revert "Compile 'test_ssl_fast_forward-*-t' against 'libmariadb' and 'libmysqlclient'" This reverts commit 207792b03e170bddc7a481aec59ae25242d5ef2a. --- test/tap/tests/Makefile | 12 ------------ ...t_forward-2.cpp => test_ssl_fast_forward-2-t.cpp} | 0 ...t_forward-3.cpp => test_ssl_fast_forward-3-t.cpp} | 0 3 files changed, 12 deletions(-) rename test/tap/tests/{test_ssl_fast_forward-2.cpp => test_ssl_fast_forward-2-t.cpp} (100%) rename test/tap/tests/{test_ssl_fast_forward-3.cpp => test_ssl_fast_forward-3-t.cpp} (100%) diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile index 9d970dc75..54578d91a 100644 --- a/test/tap/tests/Makefile +++ b/test/tap/tests/Makefile @@ -345,18 +345,6 @@ test_sqlite3_special_queries_libmariadb-t: test_sqlite3_special_queries.cpp $(TA test_sqlite3_special_queries_libmysql-t: test_sqlite3_special_queries.cpp $(TAP_LDIR)/libtap_mysql8.a $(CXX) -DLIBMYSQL_HELPER8 -DDISABLE_WARNING_COUNT_LOGGING $< -I$(TEST_MYSQL8_IDIR) -I$(TEST_MYSQL8_EDIR) -L$(TEST_MYSQL8_LDIR) -lmysqlclient -ltap_mysql8 -lresolv $(CUSTOMARGS) -o $@ -test_ssl_fast_forward-2_libmariadb-t: test_ssl_fast_forward-2.cpp $(TAP_LDIR)/libtap.so - $(CXX) -DDISABLE_WARNING_COUNT_LOGGING $< $(IDIRS) $(LDIRS) $(OPT) $(MYLIBS) $(STATIC_LIBS) -o $@ - -test_ssl_fast_forward-2_libmysql-t: test_ssl_fast_forward-2.cpp $(TAP_LDIR)/libtap_mysql8.a - $(CXX) -DLIBMYSQL_HELPER8 -DDISABLE_WARNING_COUNT_LOGGING $< -I$(TEST_MYSQL8_IDIR) -I$(TEST_MYSQL8_EDIR) -L$(TEST_MYSQL8_LDIR) -lmysqlclient -ltap_mysql8 -lresolv $(CUSTOMARGS) -o $@ - -test_ssl_fast_forward-3_libmariadb-t: test_ssl_fast_forward-3.cpp $(TAP_LDIR)/libtap.so - $(CXX) -DDISABLE_WARNING_COUNT_LOGGING $< $(IDIRS) $(LDIRS) $(OPT) $(MYLIBS) $(STATIC_LIBS) -o $@ - -test_ssl_fast_forward-3_libmysql-t: test_ssl_fast_forward-3.cpp $(TAP_LDIR)/libtap_mysql8.a - $(CXX) -DLIBMYSQL_HELPER8 -DDISABLE_WARNING_COUNT_LOGGING $< -I$(TEST_MYSQL8_IDIR) -I$(TEST_MYSQL8_EDIR) -L$(TEST_MYSQL8_LDIR) -lmysqlclient -ltap_mysql8 -lresolv $(CUSTOMARGS) -o $@ - test_clickhouse_server_libmysql-t: test_clickhouse_server-t.cpp $(TAP_LDIR)/libtap.so $(CXX) -DLIBMYSQL_HELPER -DDISABLE_WARNING_COUNT_LOGGING $< -I$(TEST_MYSQL_IDIR) -I$(TEST_MYSQL_EDIR) -L$(TEST_MYSQL_LDIR) -lmysqlclient -ltap_mysql57 $(CUSTOMARGS) -o $@ diff --git a/test/tap/tests/test_ssl_fast_forward-2.cpp b/test/tap/tests/test_ssl_fast_forward-2-t.cpp similarity index 100% rename from test/tap/tests/test_ssl_fast_forward-2.cpp rename to test/tap/tests/test_ssl_fast_forward-2-t.cpp diff --git a/test/tap/tests/test_ssl_fast_forward-3.cpp b/test/tap/tests/test_ssl_fast_forward-3-t.cpp similarity index 100% rename from test/tap/tests/test_ssl_fast_forward-3.cpp rename to test/tap/tests/test_ssl_fast_forward-3-t.cpp