From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Sep 2015 08:26:25 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_3_72~2^2~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac457551258d8098330e7e39aac6f5770f24c53d;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-unity

bk: 55f7d631XeCa2NLT23CJUAvLb9Ppfg
---

ac457551258d8098330e7e39aac6f5770f24c53d
diff --cc ChangeLog
index 7f3b7ce07,dda48bb44..dd2203a55
--- a/ChangeLog
+++ b/ChangeLog
@@@ -106,8 -108,8 +108,10 @@@ fixed formatting. Tomasz Flendric
    Reduced the number of warnings by half. Damir Tomić.
  * Updated generate_test_runner.rb and updated the sntp/unity/auto directory
    with the latest Unity updates from Mark. Damir Tomić.
 +* Retire google test - phase I.  Harlan Stenn.
 +* Unity test cleanup: move declaration of 'initializing'.  Harlan Stenn.
+ * Update the NEWS file.  Harlan Stenn.
+ * Autoconf cleanup.  Harlan Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
  
diff --cc tests/ntpd/Makefile.am
index 1618bcd33,2668da1db..6d85502a2
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@@ -9,17 -9,23 +9,27 @@@ std_unity_list = 						
  run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
  
  check_PROGRAMS =		\
 +	test-ntp_signd		\
  	test-leapsec		\
 -	test-ntp_prio_q		\
 -	test-ntp_restrict	\
  	test-rc_cmdlength   	\
 +	test-ntp_restrict	\
  	test-ntp_scanner	\
 +	test-ntp_prio_q		\
 +	$(NULL)
 +
 +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	\
  	$(top_builddir)/libntp/libntp.a	\