Unit test dist cleanup. Harlan Stenn

bk: 55f7f6a0-YOj_tFgHWnmAYL5f4D9Kg

diff --git a/ChangeLog b/ChangeLog
index dd2203a551f687f16dd4d5f6dda3a9ae61e990da..88bad4ae743e09270602593456fe0906903629a9 100644 (file)
--- 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 c0c98dce91fce1194f33e90d06b9264f2f4348a6..a08aa134770116a2a696f43f2080449aac47f605 100644 (file)
--- 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 ced5d1783d9f247694df4dcb43655177e9007e3e..246f842011ebe0a7a90cee3655c81968cc8b586f 100644 (file)
--- 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 c2248368fbc0f9cfebc74fa7682277256d923db4..af502b9a3455108c8dbc2ddc9c609b8c00ec7ce8 100644 (file)
--- 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 6d85502a236d500465c17d31b312513c11a54214..189fedb97898273593af3fd79310305bd650f6ea 100644 (file)
--- 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  \