more makefile fixes

sysown · Nov 2, 2023 · c619b2d · c619b2d
1 parent b939609
commit c619b2d
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile
@@ -158,10 +158,10 @@ OPT := $(STDCPP) -O2 -ggdb -Wl,--no-as-needed -Wl,-rpath,$(TAP_LDIR) $(WGCOV) -D
 default: all
 
 .PHONY: all
-all: tests
+all: build_test_deps tests
 
 debug: OPT := $(STDCPP) -O0 -DDEBUG -ggdb -Wl,--no-as-needed -Wl,-rpath,$(TAP_LDIR) $(WGCOV) $(WASAN) -DGITVERSION=\"$(GIT_VERSION)\"
-debug: tests
+debug: build_test_deps tests
 
 tests: tests-cpp tests-php tests-py \
 	setparser_test reg_test_3504-change_user_libmariadb_helper reg_test_3504-change_user_libmysql_helper \
@@ -177,6 +177,20 @@ testgalera: galera_1_timeout_count galera_2_timeout_no_count
 testaurora: aurora
 
 
+### test deps targets
+
+build_test_deps: $(TAP_LDIR)/libtap.so $(TEST_MARIADB_LDIR)/libmariadbclient.a $(TEST_MYSQL_LDIR)/libmysqlclient.a
+
+$(TAP_LDIR)/libtap.so:
+	cd $(TAP_PATH) && CC=${CC} CXX=${CXX} ${MAKE} 
+
+$(TEST_MARIADB_LDIR)/libmariadbclient.a:
+	cd $(TEST_DEPS_PATH) && CC=${CC} CXX=${CXX} ${MAKE} mariadb_client
+
+$(TEST_MYSQL_LDIR)/libmysqlclient.a:
+	cd $(TEST_DEPS_PATH) && CC=${CC} CXX=${CXX} ${MAKE} mysql_client
+
+
 ### helper targets
 
 set_testing-240.csv: generate_set_session_csv