From: Lokesh Walase <lokeshw24@ntp.org>
Date: Fri, 19 Jun 2015 07:16:38 +0000 (+0530)
Subject: Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Tag: NTP_4_3_43~2^2~7^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2d6cb814907d220bb04720c9e7f6c19a6ce3d2;p=thirdparty%2Fntp.git

Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 5583c1d62LdqfMRMRbA6e6kQdfu5Uw
---

5a2d6cb814907d220bb04720c9e7f6c19a6ce3d2
diff --cc tests/libntp/Makefile.am
index ac509eb17,f007d867e..f9e16f4c4
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@@ -24,9 -25,9 +25,10 @@@ check_PROGRAMS =		
  	test-numtohost		\
  	test-octtoint		\
  	test-refnumtoa		\
 +	test-ssl_init		\
  	test-socktoa		\
  	test-statestr		\
+ 	test-strtolfp       \
  	test-timespecops	\
  	test-timevalops		\
  	test-uglydate		\
@@@ -98,10 -99,10 +100,10 @@@ tests_SOURCES =					
  	recvbuff.cpp		\
  	g_refnumtoa.cpp		\
  	sfptostr.cpp		\
 -	socktoa.cpp		\
 -	ssl_init.cpp		\
 +	g_socktoa.cpp		\
 +	g_ssl_init.cpp		\
  	g_statestr.cpp		\
- 	strtolfp.cpp		\
+ 	g_strtolfp.cpp		\
  	g_timespecops.cpp	\
  	timestructs.cpp		\
  	g_timevalops.cpp	\
@@@ -130,11 -132,9 +133,12 @@@ BUILT_SOURCES +=			
  	$(srcdir)/run-numtohost.c	\
  	$(srcdir)/run-octtoint.c	\
  	$(srcdir)/run-refnumtoa.c	\
 +	$(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-uglydate.c	\
  	$(srcdir)/run-vi64ops.c		\
  	$(srcdir)/run-ymd2yd.c		\
@@@ -272,6 -274,22 +278,38 @@@ test_socktoa_LDADD =			
  	$(unity_tests_LDADD)		\
  	$(NULL)
  
+ test_strtolfp_CFLAGS =			\
+ 	-I$(top_srcdir)/sntp/unity	\
+ 	$(NULL)
+ 
+ test_strtolfp_LDADD =			\
+ 	$(unity_tests_LDADD)		\
+ 	$(NULL)
+ 
+ test_lfptostr_CFLAGS =			\
+ 	-I$(top_srcdir)/sntp/unity	\
+ 	$(NULL)
+ 
+ test_lfptostr_LDADD =			\
+ 	$(unity_tests_LDADD)		\
+ 	$(NULL)
+ 
++test_strtolfp_CFLAGS =			\
++	-I$(top_srcdir)/sntp/unity	\
++	$(NULL)
++
++test_strtolfp_LDADD =			\
++	$(unity_tests_LDADD)		\
++	$(NULL)
++
++test_lfptostr_CFLAGS =			\
++	-I$(top_srcdir)/sntp/unity	\
++	$(NULL)
++
++test_lfptostr_LDADD =			\
++	$(unity_tests_LDADD)		\
++	$(NULL)
++
  test_a_md5encrypt_CFLAGS =			\
  	-I$(top_srcdir)/sntp/unity		\
  	$(NULL)
@@@ -377,15 -395,6 +415,24 @@@ test_timespecops_LDADD =			
  	$(top_builddir)/sntp/unity/libunity.a	\
  	$(NULL)
  
 +test_ssl_init_CFLAGS =				\
 +	-I$(top_srcdir)/sntp/unity		\
 +	$(NULL)
 +
 +test_ssl_init_LDADD =				\
 +	$(LDADD)				\
 +	$(top_builddir)/sntp/unity/libunity.a	\
 +	$(NULL)
 +
++test_ssl_init_CFLAGS =				\
++	-I$(top_srcdir)/sntp/unity		\
++	$(NULL)
++
++test_ssl_init_LDADD =				\
++	$(LDADD)				\
++	$(top_builddir)/sntp/unity/libunity.a	\
++	$(NULL)
++
  
  test_modetoa_SOURCES =			\
  	modetoa.c			\
@@@ -457,6 -466,16 +504,26 @@@ test_socktoa_SOURCES =			
  	run-socktoa.c			\
  	$(NULL)
  
+ test_strtolfp_SOURCES =			\
+ 	strtolfp.c			\
+ 	run-strtolfp.c			\
+ 	$(NULL)
+ 
+ test_lfptostr_SOURCES =			\
+ 	lfptostr.c			\
+ 	run-lfptostr.c			\
+ 	$(NULL)
+ 
++test_strtolfp_SOURCES =			\
++	strtolfp.c			\
++	run-strtolfp.c			\
++	$(NULL)
++
++test_lfptostr_SOURCES =			\
++	lfptostr.c			\
++	run-lfptostr.c			\
++	$(NULL)
++
  test_atouint_SOURCES =			\
  	atouint.c			\
  	run-atouint.c			\
@@@ -516,12 -535,6 +583,18 @@@ test_timespecops_SOURCES =		
  	run-timespecops.c		\
  	$(NULL)
  
 +test_ssl_init_SOURCES =			\
 +	ssl_init.c			\
 +	run-ssl_init.c			\
 +	$(NULL)
 +
 +
++test_ssl_init_SOURCES =			\
++	ssl_init.c			\
++	run-ssl_init.c			\
++	$(NULL)
++
++
  $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
  	$(run_unity) modetoa.c run-modetoa.c
  
@@@ -561,6 -574,12 +634,18 @@@ $(srcdir)/run-decodenetnum.c: $(srcdir)
  $(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list)
  	$(run_unity) socktoa.c run-socktoa.c
  
+ $(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list)
+ 	$(run_unity) strtolfp.c run-strtolfp.c
+ 
+ $(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list)
+ 	$(run_unity) lfptostr.c run-lfptostr.c
+ 
++$(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list)
++	$(run_unity) strtolfp.c run-strtolfp.c
++
++$(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list)
++	$(run_unity) lfptostr.c run-lfptostr.c
++
  $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list)
  	$(run_unity) a_md5encrypt.c run-a_md5encrypt.c
  
@@@ -597,8 -616,6 +682,10 @@@ $(srcdir)/run-timevalops.c: $(srcdir)/t
  $(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list)
  	$(run_unity) timespecops.c run-timespecops.c
  
++$(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
++	$(run_unity) ssl_init.c run-ssl_init.c
 +$(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
 +	$(run_unity) ssl_init.c run-ssl_init.c
  
  TESTS =