From f01042fb9756889723ef3c88efd1b3e6cc13a840 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 5 Dec 2018 13:53:00 +0000 Subject: [PATCH] Simplify test makefiles. --- test/broker/c/Makefile | 38 ++++++------ test/lib/c/Makefile | 137 +++++++++++------------------------------ 2 files changed, 54 insertions(+), 121 deletions(-) diff --git a/test/broker/c/Makefile b/test/broker/c/Makefile index f60f9d5f..2005270d 100644 --- a/test/broker/c/Makefile +++ b/test/broker/c/Makefile @@ -1,34 +1,32 @@ -.PHONY: all test clean reallyclean 08 +.PHONY: all test clean reallyclean CFLAGS=-I../../../lib -I../../../src -Wall -Werror -all : auth_plugin.so auth_plugin_pwd.so auth_plugin_acl.so auth_plugin_v2.so auth_plugin_msg_params.so auth_plugin_context_params.so 08 +PLUGIN_SRC = \ + auth_plugin.c \ + auth_plugin_pwd.c \ + auth_plugin_acl.c \ + auth_plugin_v2.c \ + auth_plugin_context_params.c \ + auth_plugin_msg_params.c -08 : 08-tls-psk-pub.test 08-tls-psk-bridge.test +PLUGINS = ${PLUGIN_SRC:.c=.so} -auth_plugin.so : auth_plugin.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ +SRC = \ + 08-tls-psk-pub.c \ + 08-tls-psk-bridge.c -auth_plugin_pwd.so : auth_plugin_pwd.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ +TESTS = ${SRC:.c=.test} -auth_plugin_acl.so : auth_plugin_acl.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ -auth_plugin_v2.so : auth_plugin_v2.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ +all : ${PLUGINS} ${TESTS} -auth_plugin_context_params.so : auth_plugin_context_params.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ +${PLUGINS} : %.so: %.c + $(CC) ${CFLAGS} -fPIC -shared $< -o $@ -auth_plugin_msg_params.so : auth_plugin_msg_params.c - $(CC) ${CFLAGS} -fPIC -shared $^ -o $@ -08-tls-psk-pub.test : 08-tls-psk-pub.c - $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 - -08-tls-psk-bridge.test : 08-tls-psk-bridge.c - $(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1 +${TESTS} : %.test: %.c + $(CC) ${CFLAGS} $< -o $@ ../../../lib/libmosquitto.so.1 reallyclean : clean diff --git a/test/lib/c/Makefile b/test/lib/c/Makefile index 4727680f..0986b528 100644 --- a/test/lib/c/Makefile +++ b/test/lib/c/Makefile @@ -1,111 +1,46 @@ -.PHONY: all test 01 02 03 04 08 09 clean reallyclean +.PHONY: all clean reallyclean CFLAGS=-I../../../lib -Werror LIBS=../../../lib/libmosquitto.so.1 -all : 01 02 03 04 08 09 11 +SRC = \ + 01-con-discon-success.c \ + 01-will-set.c \ + 01-unpwd-set.c \ + 01-will-unpwd-set.c \ + 01-no-clean-session.c \ + 01-keepalive-pingreq.c \ + 02-subscribe-qos0.c \ + 02-subscribe-qos1.c \ + 02-subscribe-qos2.c \ + 02-unsubscribe.c \ + 03-publish-qos0.c \ + 03-publish-qos0-no-payload.c \ + 03-publish-c2b-qos1-disconnect.c \ + 03-publish-c2b-qos2.c \ + 03-publish-c2b-qos2-disconnect.c \ + 03-publish-b2c-qos1.c \ + 03-request-response-1.c \ + 03-request-response-2.c \ + 03-request-response-correlation-1.c \ + 03-publish-b2c-qos2.c \ + 04-retain-qos0.c \ + 08-ssl-connect-no-auth.c \ + 08-ssl-connect-cert-auth.c \ + 08-ssl-connect-cert-auth-enc.c \ + 08-ssl-bad-cacert.c \ + 08-ssl-fake-cacert.c \ + 09-util-topic-tokenise.c \ + 11-prop-send-payload-format.c \ + 11-prop-send-content-type.c -01-con-discon-success.test : 01-con-discon-success.c +TESTS = ${SRC:.c=.test} + +all : ${TESTS} + +${TESTS} : %.test: %.c $(CC) $< -o $@ $(CFLAGS) $(LIBS) -01-will-set.test : 01-will-set.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -01-unpwd-set.test : 01-unpwd-set.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -01-will-unpwd-set.test : 01-will-unpwd-set.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -01-no-clean-session.test : 01-no-clean-session.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -01-keepalive-pingreq.test : 01-keepalive-pingreq.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -02-subscribe-qos0.test : 02-subscribe-qos0.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -02-subscribe-qos1.test : 02-subscribe-qos1.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -02-subscribe-qos2.test : 02-subscribe-qos2.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -02-unsubscribe.test : 02-unsubscribe.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-qos0.test : 03-publish-qos0.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-qos0-no-payload.test : 03-publish-qos0-no-payload.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-c2b-qos1-disconnect.test : 03-publish-c2b-qos1-disconnect.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-c2b-qos2.test : 03-publish-c2b-qos2.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-c2b-qos2-disconnect.test : 03-publish-c2b-qos2-disconnect.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-b2c-qos1.test : 03-publish-b2c-qos1.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-request-response-1.test : 03-request-response-1.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-request-response-2.test : 03-request-response-2.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-request-response-correlation-1.test : 03-request-response-correlation-1.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -03-publish-b2c-qos2.test : 03-publish-b2c-qos2.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -04-retain-qos0.test : 04-retain-qos0.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -08-ssl-connect-no-auth.test : 08-ssl-connect-no-auth.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -08-ssl-connect-cert-auth.test : 08-ssl-connect-cert-auth.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -08-ssl-connect-cert-auth-enc.test : 08-ssl-connect-cert-auth-enc.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -08-ssl-bad-cacert.test : 08-ssl-bad-cacert.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -08-ssl-fake-cacert.test : 08-ssl-fake-cacert.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -09-util-topic-tokenise.test : 09-util-topic-tokenise.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -11-prop-send-payload-format.test : 11-prop-send-payload-format.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -11-prop-send-content-type.test : 11-prop-send-content-type.c - $(CC) $< -o $@ $(CFLAGS) $(LIBS) - -01 : 01-con-discon-success.test 01-will-set.test 01-unpwd-set.test 01-will-unpwd-set.test 01-no-clean-session.test 01-keepalive-pingreq.test - -02 : 02-subscribe-qos0.test 02-subscribe-qos1.test 02-subscribe-qos2.test 02-unsubscribe.test - -03 : 03-publish-qos0.test 03-publish-qos0-no-payload.test 03-publish-c2b-qos1-disconnect.test 03-publish-c2b-qos2.test 03-publish-c2b-qos2-disconnect.test 03-publish-b2c-qos1.test 03-publish-b2c-qos2.test 03-request-response-1.test 03-request-response-2.test 03-request-response-correlation-1.test - -04 : 04-retain-qos0.test - -08 : 08-ssl-connect-no-auth.test 08-ssl-connect-cert-auth.test 08-ssl-connect-cert-auth-enc.test 08-ssl-bad-cacert.test 08-ssl-fake-cacert.test - -09 : 09-util-topic-tokenise.test - -11 : 11-prop-send-payload-format.test 11-prop-send-content-type.test - reallyclean : clean -rm -f *.orig