From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Sep 2015 10:44:48 +0000 (+0000)
Subject:  Unit test dist cleanup. Harlan Stenn
X-Git-Tag: NTP_4_3_72~2^2~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79b4976b4a7012c489e5ce74507320bd27d8d55b;p=thirdparty%2Fntp.git

 Unit test dist cleanup. Harlan Stenn

bk: 55f7f6a0-YOj_tFgHWnmAYL5f4D9Kg
---

diff --git a/ChangeLog b/ChangeLog
index dd2203a55..88bad4ae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -112,6 +112,7 @@ fixed formatting. Tomasz Flendrich
 * Unity test cleanup: move declaration of 'initializing'.  Harlan Stenn.
 * Update the NEWS file.  Harlan Stenn.
 * Autoconf cleanup.  Harlan Stenn.
+* Unit test dist cleanup. Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/sntp/configure.ac b/sntp/configure.ac
index c0c98dce9..a08aa1347 100644
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -11,6 +11,7 @@ AC_INIT(
 )
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([libevent/build-aux])
+AC_LANG([C])
 
 # Bump sntp_configure_cache_version for each change to configure.ac or
 # .m4 files which invalidates cached values from previous configure 
diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index ced5d1783..246f84201 100644
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -15,6 +15,8 @@ DISTCLEANFILES =		\
 	kod-output-blank	\
 	kod-output-single 	\
 	kod-output-multiple	\
+	testLogfile.log		\
+	testLogfile2.log	\
 	$(NULL)
 
 std_unity_list =					\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2248368f..af502b9a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS +=		\
 	bug-2803	\
 	libntp		\
 	ntpd		\
+	ntpq		\
 	sandbox		\
 	sec-2853	\
 	$(NULL)
diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am
index 6d85502a2..189fedb97 100644
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@ -20,15 +20,6 @@ check_PROGRAMS =		\
 EXTRA_PROGRAMS =		\
 	$(NULL)
 
-EXTRA_PROGRAMS = 		\
-	test-ntp_signd		\ #doesn't work, can't link it because you can't link static function
-	$(NULL)
-
-if GTEST_AVAILABLE
-check_PROGRAMS += tests
-else
-EXTRA_PROGRAMS += tests
-endif
 
 LDADD =					\
 	$(top_builddir)/ntpd/libntpd.a	\