From: Damir Tomic <viperus@ntp.org>
Date: Fri, 19 Jun 2015 19:21:22 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/tflendrich/develpment/to_delivery/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a9cb9cb05f07e6261730db36834defaf32fdf3;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/tflendrich/develpment/to_delivery/ntp-stable-unity
into  ubuntu.(none):/home/viperus/Desktop/ntp-stable-unity

bk: 55846bb2vg26L-GrxA0XDXwoAJV2ww
---

c1a9cb9cb05f07e6261730db36834defaf32fdf3
diff --cc tests/libntp/Makefile.am
index b19a46412,fd1b7bf9b..8da86031b
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -18,22 -19,24 +19,26 @@@ check_PROGRAMS =		
  	test-hextoint		\
  	test-hextolfp		\
  	test-lfpfunc		\
 +	test-lfptostr		\
  	test-modetoa		\
- 	test-netof		\
- 	test-numtoa		\
+ 	test-msyslog		\
+ 	test-netof			\
+ 	test-numtoa			\
  	test-numtohost		\
  	test-octtoint		\
+ 	test-prettydate		\
+ 	test-recvbuff		\
  	test-refnumtoa		\
  	test-ssl_init		\
  	test-socktoa		\
  	test-statestr		\
 +	test-strtolfp       \
  	test-timespecops	\
  	test-timevalops		\
+ 	test-tstotv			\
  	test-uglydate		\
  	test-vi64ops		\
- 	test-ymd2yd		\
+ 	test-ymd2yd			\
  	$(NULL)
  
  if GTEST_AVAILABLE
@@@ -89,10 -92,10 +94,10 @@@ tests_SOURCES =					
  	g_hextolfp.cpp		\
  	humandate.cpp		\
  	g_lfpfunc.cpp		\
 -	lfptostr.cpp		\
 +	g_lfptostr.cpp		\
  	g_modetoa.cpp		\
- 	msyslog.cpp		\
- 	g_netof.cpp		\
+ 	g_msyslog.cpp		\
+ 	g_netof.cpp			\
  	g_numtoa.cpp		\
  	g_numtohost.cpp		\
  	g_octtoint.cpp		\
@@@ -126,8 -130,8 +132,9 @@@ BUILT_SOURCES +=			
  	$(srcdir)/run-hextoint.c	\
  	$(srcdir)/run-hextolfp.c	\
  	$(srcdir)/run-lfpfunc.c		\
 +	$(srcdir)/run-lfptostr.c		\
  	$(srcdir)/run-modetoa.c		\
+ 	$(srcdir)/run-msyslog.c		\
  	$(srcdir)/run-netof.c		\
  	$(srcdir)/run-numtoa.c		\
  	$(srcdir)/run-numtohost.c	\
@@@ -136,9 -142,9 +145,10 @@@
  	$(srcdir)/run-ssl_init.c	\
  	$(srcdir)/run-socktoa.c		\
  	$(srcdir)/run-statestr.c	\
 +	$(srcdir)/run-strtolfp.c	\
  	$(srcdir)/run-timevalops.c	\
  	$(srcdir)/run-timespecops.c	\
+ 	$(srcdir)/run-tstotv.c		\
  	$(srcdir)/run-uglydate.c	\
  	$(srcdir)/run-vi64ops.c		\
  	$(srcdir)/run-ymd2yd.c		\