From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 20 Jun 2015 22:41:34 +0000 (+0000)
Subject: gtest->Unity cleanup
X-Git-Tag: NTP_4_3_43~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3409c07231d8f17331f22949507ffd62aa96e6b9;p=thirdparty%2Fntp.git

gtest->Unity cleanup

bk: 5585ec1eswPgBO8mCYMeXKCfxHpgTA
---

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index 523d32341..0a2048769 100644
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -11,7 +11,7 @@ run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 #EXTRA_PROGRAMS +=	test-keyFile
 
 check_PROGRAMS =		\
-	test-crypto         \
+	test-crypto		\
 	test-keyFile		\
 	test-kodDatabase	\
 	test-kodFile		\
@@ -35,16 +35,20 @@ base_SOURCES =			\
 
 tests_SOURCES =			\
 	$(base_SOURCES)		\
-	g_crypto.cpp		\
-	g_keyFile.cpp		\
-	g_kodDatabase.cpp	\
-	g_kodFile.cpp		\
 	g_networking.cpp	\
 	packetHandling.cpp	\
 	packetProcessing.cpp	\
-	g_utilities.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		\
diff --git a/sntp/tests_main.cpp b/sntp/tests_main.cpp
index 3d11bb130..584165d66 100644
--- a/sntp/tests_main.cpp
+++ b/sntp/tests_main.cpp
@@ -1,5 +1,9 @@
 #include "tests_main.h"
 
+extern "C" {
+const char * Version = "stub unit test Version string";
+};
+
 int main(int argc, char **argv) {
 	::testing::InitGoogleTest(&argc, argv);
 
diff --git a/tests/libntp/g_buftvtots.cpp b/tests/libntp/g_buftvtots.cpp
index bb8a32d35..050398b28 100644
--- a/tests/libntp/g_buftvtots.cpp
+++ b/tests/libntp/g_buftvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "ntp_unixtime.h"
diff --git a/tests/libntp/g_decodenetnum.cpp b/tests/libntp/g_decodenetnum.cpp
index c6766de28..059642890 100644
--- a/tests/libntp/g_decodenetnum.cpp
+++ b/tests/libntp/g_decodenetnum.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class decodenetnumTest : public sockaddrtest {
 };
diff --git a/tests/libntp/g_hextolfp.cpp b/tests/libntp/g_hextolfp.cpp
index 2e9f072cd..bcfb094f9 100644
--- a/tests/libntp/g_hextolfp.cpp
+++ b/tests/libntp/g_hextolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 class hextolfpTest : public lfptest {
 };
diff --git a/tests/libntp/g_netof.cpp b/tests/libntp/g_netof.cpp
index 67b9df4e7..8fc9ac768 100644
--- a/tests/libntp/g_netof.cpp
+++ b/tests/libntp/g_netof.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class netofTest : public sockaddrtest  {
 };
diff --git a/tests/libntp/g_socktoa.cpp b/tests/libntp/g_socktoa.cpp
index 6c70b6d8d..2bb2fb1e7 100644
--- a/tests/libntp/g_socktoa.cpp
+++ b/tests/libntp/g_socktoa.cpp
@@ -1,4 +1,4 @@
-#include "sockaddrtest.h"
+#include "g_sockaddrtest.h"
 
 class socktoaTest : public sockaddrtest {
 };
diff --git a/tests/libntp/g_strtolfp.cpp b/tests/libntp/g_strtolfp.cpp
index 729996e0b..d1b361e86 100644
--- a/tests/libntp/g_strtolfp.cpp
+++ b/tests/libntp/g_strtolfp.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 /* This class tests both atolfp and mstolfp */
 
diff --git a/tests/libntp/g_tvtots.cpp b/tests/libntp/g_tvtots.cpp
index c51b7f59e..fcb82a30b 100644
--- a/tests/libntp/g_tvtots.cpp
+++ b/tests/libntp/g_tvtots.cpp
@@ -1,4 +1,4 @@
-#include "lfptest.h"
+#include "g_lfptest.h"
 
 extern "C" {
 #include "timevalops.h"