From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 16 Sep 2015 11:10:41 +0000 (+0000)
Subject: Cleanup various test Makefile.am files.  Harlan Stenn.
X-Git-Tag: NTP_4_3_72~2^2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae5650fe70e3e1a1f8dd808fb6f681a8acbd155;p=thirdparty%2Fntp.git

Cleanup various test Makefile.am files.  Harlan Stenn.

bk: 55f94e317xK_O-elaHzI8lb0Jne94w
---

diff --git a/ChangeLog b/ChangeLog
index 88bad4ae7..d07870b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@ fixed formatting. Tomasz Flendrich
 * Update the NEWS file.  Harlan Stenn.
 * Autoconf cleanup.  Harlan Stenn.
 * Unit test dist cleanup. Harlan Stenn.
+* Cleanup various test Makefile.am files.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index 246f84201..3a1634727 100644
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -30,11 +30,11 @@ run_unity =	cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb
 #EXTRA_PROGRAMS +=		test-packetHandling test-packetProcessing
 
 check_PROGRAMS =			\
-	test-log			\
 	test-crypto			\
 	test-keyFile			\
 	test-kodDatabase		\
 	test-kodFile			\
+	test-log			\
 	test-networking			\
 	test-packetHandling		\
 	test-packetProcessing		\
@@ -108,9 +108,9 @@ BUILT_SOURCES +=				\
 	$(srcdir)/run-kodDatabase.c		\
 	$(srcdir)/run-kodFile.c			\
 	$(srcdir)/run-networking.c		\
+	$(srcdir)/run-packetHandling.c		\
 	$(srcdir)/run-packetProcessing.c	\
 	$(srcdir)/run-utilities.c		\
-	$(srcdir)/run-packetHandling.c		\
 	$(NULL)
 
 test_networking_SOURCES =		\
@@ -132,17 +132,17 @@ test_kodDatabase_SOURCES =		\
 	$(NULL)
 
 test_keyFile_SOURCES =			\
+	fileHandlingTest.c		\
 	keyFile.c			\
 	run-keyFile.c			\
-	fileHandlingTest.c		\
 	$(top_builddir)/version.c	\
 	$(NULL)
 
 test_kodFile_SOURCES =			\
+	fileHandlingTest.c		\
 	kodFile.c			\
 	run-kodFile.c			\
 	$(top_builddir)/version.c	\
-	fileHandlingTest.c		\
 	$(NULL)
 
 test_packetProcessing_SOURCES =		\
@@ -152,9 +152,9 @@ test_packetProcessing_SOURCES =		\
 	$(NULL)
 
 test_utilities_SOURCES =		\
+	fileHandlingTest.c		\
 	utilities.c			\
 	run-utilities.c			\
-	fileHandlingTest.c		\
 	$(NULL)
 
 test_crypto_CFLAGS =			\
diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 1b0220263..7bfe9eea8 100644
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -117,9 +117,9 @@ noinst_HEADERS =	\
 
 ###
 
-test_a_md5encrypt_SOURCES =		\
-	a_md5encrypt.c			\
-	run-a_md5encrypt.c		\
+test_a_md5encrypt_SOURCES =	\
+	a_md5encrypt.c		\
+	run-a_md5encrypt.c	\
 	$(NULL)
 
 $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list)
@@ -127,9 +127,9 @@ $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list)
 
 ###
 
-test_atoint_SOURCES =			\
-	atoint.c			\
-	run-atoint.c			\
+test_atoint_SOURCES =		\
+	atoint.c		\
+	run-atoint.c		\
 	$(NULL)
 
 $(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list)
@@ -137,9 +137,9 @@ $(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list)
 
 ###
 
-test_atouint_SOURCES =			\
-	atouint.c			\
-	run-atouint.c			\
+test_atouint_SOURCES =		\
+	atouint.c		\
+	run-atouint.c		\
 	$(NULL)
 
 $(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list)
@@ -147,9 +147,9 @@ $(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list)
 
 ###
 
-test_authkeys_SOURCES =			\
-	authkeys.c			\
-	run-authkeys.c			\
+test_authkeys_SOURCES =		\
+	authkeys.c		\
+	run-authkeys.c		\
 	$(NULL)
 
 $(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list)
@@ -157,10 +157,10 @@ $(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list)
 
 ###
 
-test_buftvtots_SOURCES =		\
-	buftvtots.c			\
-	run-buftvtots.c			\
-	lfptest.c			\
+test_buftvtots_SOURCES =	\
+	buftvtots.c		\
+	run-buftvtots.c		\
+	lfptest.c		\
 	$(NULL)
 
 $(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list)
@@ -168,10 +168,10 @@ $(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list)
 
 ###
 
-test_calendar_SOURCES =			\
-	calendar.c			\
-	run-calendar.c			\
-	test-libntp.c			\
+test_calendar_SOURCES =		\
+	calendar.c		\
+	run-calendar.c		\
+	test-libntp.c		\
 	$(NULL)
 
 $(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list)
@@ -184,9 +184,9 @@ test_caltontp_CFLAGS =		\
 	$(AM_CFLAGS)		\
 	$(NULL)
 
-test_caltontp_SOURCES =			\
-	caltontp.c			\
-	run-caltontp.c			\
+test_caltontp_SOURCES =		\
+	caltontp.c		\
+	run-caltontp.c		\
 	$(NULL)
 
 $(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list)
diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am
index 189fedb97..30506fed9 100644
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@ -9,12 +9,12 @@ std_unity_list = 						\
 run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
 check_PROGRAMS =		\
-	test-ntp_signd		\
 	test-leapsec		\
-	test-rc_cmdlength   	\
+	test-ntp_prio_q		\
 	test-ntp_restrict	\
 	test-ntp_scanner	\
-	test-ntp_prio_q		\
+	test-ntp_signd		\
+	test-rc_cmdlength   	\
 	$(NULL)
 
 EXTRA_PROGRAMS =		\
@@ -55,17 +55,13 @@ BUILT_SOURCES +=			\
 	$(srcdir)/run-t-ntp_signd.c	\
 	$(NULL)
 
-#noinst_HEADERS =				\
-#	g_ntpdtest.h				\
-#	$(srcdir)/../libntp/test-libntp.h	\
-#	$(NULL)
-
 ###
 
 test_leapsec_CFLAGS =			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)
-#probably needs -lpthread in LDADD
+
+# Might need pthread support
 test_leapsec_LDADD =			\
 	$(unity_tests_LDADD)		\
 	$(NULL)
@@ -79,7 +75,6 @@ test_leapsec_SOURCES =			\
 $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list)
 	$(run_unity) leapsec.c run-leapsec.c
 
-
 ###
 test_ntp_prio_q_CFLAGS =		\
 	-I$(top_srcdir)/sntp/unity	\
@@ -148,8 +143,8 @@ test_ntp_signd_LDADD =			\
 	$(top_builddir)/ntpd/ntp_io.o	\
 	$(NULL)
 
-test_ntp_signd_SOURCES =		\
-	t-ntp_signd.c			\
+test_ntp_signd_SOURCES =			\
+	t-ntp_signd.c				\
 	run-t-ntp_signd.c			\
 	$(srcdir)/../libntp/test-libntp.c	\
 	$(srcdir)/../../ntpd/ntp_signd.c	\
diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am
index 8676cf91d..c729eee8b 100644
--- a/tests/ntpq/Makefile.am
+++ b/tests/ntpq/Makefile.am
@@ -12,7 +12,6 @@ check_PROGRAMS = 	\
 	test-ntpq	\
 	$(NULL)
 
-
 LDADD =					\
 	$(top_builddir)/ntpq/libntpq.a	\
 	$(top_builddir)/ntpd/libntpd.a	\
@@ -29,30 +28,24 @@ unity_tests_LDADD =				\
 	$(NULL)
 
 AM_CFLAGS   = $(CFLAGS_NTP)
-AM_CXXFLAGS = $(GTEST_CXXFLAGS)
-
 
 AM_CPPFLAGS  = $(NTP_INCS)
 AM_CPPFLAGS += -I$(top_srcdir)/ntpq
 #AM_CPPFLAGS += -I$(top_srcdir)/sntp
 #AM_CPPFLAGS += -I$(top_srcdir)/ntpd
 #AM_CPPFLAGS += -I$(top_srcdir)/tests/libntp
-AM_CPPFLAGS += $(GTEST_CPPFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
 AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
-tests_SOURCES = t-ntpq.c		\
-		$(NULL)
-
 BUILT_SOURCES +=			\
 	$(srcdir)/run-t-ntpq.c		\
 	$(NULL)
 
-noinst_HEADERS =	\
-		$(NULL)
+noinst_HEADERS =			\
+	$(NULL)
 
 ###
 test_ntpq_CFLAGS =			\
@@ -64,7 +57,7 @@ test_ntpq_LDADD =			\
 	$(NULL)
 
 test_ntpq_SOURCES =			\
-	t-ntpq.c				\
+	t-ntpq.c			\
 	run-t-ntpq.c			\
 	$(NULL)