From: Damir Tomic <viperus@ntp.org>
Date: Thu, 25 Jun 2015 10:05:45 +0000 (+0200)
Subject: Merge psp-deb1.ntp.org:/home/lokeshw24/ntp-stable-unity
X-Git-Tag: NTP_4_2_8P3_RC3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a6745c531798bdf4a92d27400407e6a9132360b;p=thirdparty%2Fntp.git

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

bk: 558bd279npZkxJqdxBJfpjGwR_YsUg
---

7a6745c531798bdf4a92d27400407e6a9132360b
diff --cc sntp/tests/Makefile.am
index ae8d6bf39,ba9ac671f..8e01b63ef
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@@ -10,14 -10,14 +10,15 @@@ run_unity =	cd $(srcdir) && ruby ../../
  # not production-ready
  #EXTRA_PROGRAMS +=	test-keyFile
  
 -check_PROGRAMS =		\
 -	test-crypto         \
 -	test-keyFile		\
 -	test-kodDatabase	\
 -	test-kodFile		\
 -	test-networking		\
 -	test-packetHandling \
 -	test-utilities		\
 +check_PROGRAMS =			\
 +	test-crypto			\
 +	test-keyFile			\
 +	test-kodDatabase		\
 +	test-kodFile			\
 +	test-networking			\
 +	test-packetProcessing		\
 +	test-utilities			\
++	test-packetHandling		\
  	$(NULL)
  
  if GTEST_AVAILABLE
@@@ -36,20 -36,17 +37,21 @@@ base_SOURCES =			
  
  tests_SOURCES =			\
  	$(base_SOURCES)		\
 -	g_crypto.cpp		\
 -	g_keyFile.cpp		\
 -	g_kodDatabase.cpp	\
 -	g_kodFile.cpp		\
  	g_networking.cpp	\
- 	packetHandling.cpp	\
+ 	nameresolution.cpp	\
+ 	g_packetHandling.cpp	\
 -	packetProcessing.cpp	\
 -	g_utilities.cpp		\
 +	g_packetProcessing.cpp	\
  	$(NULL)
  
 +#HMS: Somebody needs to audit the following files to
 +# make sure all of these tests are now handled by Unity
 +#
 +#	g_utilities.cpp		
 +#	g_kodDatabase.cpp	
 +#	g_keyFile.cpp		
 +#	g_crypto.cpp		
 +#	g_kodFile.cpp		
 +
  noinst_HEADERS =		\
  	fileHandlingTest.h	\
  	sntptest.h		\
@@@ -115,14 -112,14 +117,15 @@@ AM_CPPFLAGS += $(CPPFLAGS_NTP
  
  AM_LDFLAGS = $(LDFLAGS_NTP)
  
 -BUILT_SOURCES +=			\
 -	$(srcdir)/run-crypto.c		\
 -	$(srcdir)/run-keyFile.c		\
 -	$(srcdir)/run-kodDatabase.c	\
 -	$(srcdir)/run-kodFile.c		\
 -	$(srcdir)/run-networking.c	\
 -	$(srcdir)/run-packetHandling.c	\
 -	$(srcdir)/run-utilities.c	\
 +BUILT_SOURCES +=				\
 +	$(srcdir)/run-crypto.c			\
 +	$(srcdir)/run-keyFile.c			\
 +	$(srcdir)/run-kodDatabase.c		\
 +	$(srcdir)/run-kodFile.c			\
 +	$(srcdir)/run-networking.c		\
- 	$(srcdir)/packetProcessing.c	\
++	$(srcdir)/run-packetProcessing.c	\
 +	$(srcdir)/run-utilities.c		\
++	$(srcdir)/run-packetHandling.c		\
  	$(NULL)
  
  test_keyFile_CFLAGS =			\
@@@ -157,27 -154,27 +160,35 @@@ test_networking_LDADD =			
  	$(unity_tests_LDADD)		\
  	$(NULL)
  
- test_packetProcessing_CFLAGS =			\
 -test_packetHandling_CFLAGS =		\
++test_utilities_CFLAGS =			\
  	-I$(top_srcdir)/unity		\
  	$(NULL)
  
- test_packetProcessing_LDADD =			\
 -test_packetHandling_LDADD =			\
++test_utilities_LDADD =			\
  	$(unity_tests_LDADD)		\
  	$(NULL)
  
--test_utilities_CFLAGS =			\
++test_crypto_CFLAGS =			\
  	-I$(top_srcdir)/unity		\
  	$(NULL)
  
--test_utilities_LDADD =			\
++test_crypto_LDADD =			\
  	$(unity_tests_LDADD)		\
  	$(NULL)
  
--test_crypto_CFLAGS =			\
++test_packetProcessing_CFLAGS =		\
  	-I$(top_srcdir)/unity		\
  	$(NULL)
  
--test_crypto_LDADD =			\
++test_packetProcessing_LDADD =		\
++	$(unity_tests_LDADD)		\
++	$(NULL)
++
++test_packetHandling_CFLAGS =		\
++	-I$(top_srcdir)/unity		\
++	$(NULL)
++
++test_packetHandling_LDADD =		\
  	$(unity_tests_LDADD)		\
  	$(NULL)
  
@@@ -235,9 -233,9 +252,12 @@@ $(srcdir)/run-kodDatabase.c: $(srcdir)/
  $(srcdir)/run-networking.c: $(srcdir)/networking.c $(std_unity_list)
  	$(run_unity) networking.c run-networking.c
  
 +$(srcdir)/run-packetProcessing.c: $(srcdir)/packetProcessing.c $(std_unity_list)
 +	$(run_unity) packetProcessing.c run-packetProcessing.c
 +
+ $(srcdir)/run-packetHandling.c: $(srcdir)/packetHandling.c $(std_unity_list)
+ 	$(run_unity) packetHandling.c run-packetHandling.c
+ 
  $(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list)
  	$(run_unity) utilities.c run-utilities.c