From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 21 Nov 2015 03:41:16 +0000 (-0800)
Subject: Unity test cleanup.  Harlan Stenn.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4b326abbefd800609a65b83bad53b90f3e4a82;p=thirdparty%2Fntp.git

Unity test cleanup.  Harlan Stenn.

bk: 564fe7dcvh1AAb7d9IXajTc0ULNblw
---

diff --git a/sntp/tests/kodDatabase.c b/sntp/tests/kodDatabase.c
index 0c3615d0e..741a24346 100644
--- a/sntp/tests/kodDatabase.c
+++ b/sntp/tests/kodDatabase.c
@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include "ntp_workimpl.h"
 #include "ntp_types.h"
 #include "sntptest.h"
 #include "ntp_stdlib.h"
@@ -9,6 +10,10 @@
 
 #include "unity.h"
 
+#ifndef WORK_FORK
+#include "GRONK: no WORK_FORK"
+#endif
+
 void setUp(void);
 void test_SingleEntryHandling(void);
 void test_MultipleEntryHandling(void);
@@ -20,6 +25,7 @@ void test_DeleteEntry(void);
 void
 setUp(void) {
 	kod_init_kod_db("/dev/null", TRUE);
+	init_lib();
 }
 
 
diff --git a/sntp/tests/kodFile.c b/sntp/tests/kodFile.c
index 6eb0971a9..f99d8cf20 100644
--- a/sntp/tests/kodFile.c
+++ b/sntp/tests/kodFile.c
@@ -28,6 +28,7 @@ void
 setUp(void) {
 	kod_db_cnt = 0;
 	kod_db = NULL;
+	init_lib();
 }
 
 
diff --git a/sntp/tests/run-kodDatabase.c b/sntp/tests/run-kodDatabase.c
index e5bf3d728..df6d80853 100644
--- a/sntp/tests/run-kodDatabase.c
+++ b/sntp/tests/run-kodDatabase.c
@@ -23,6 +23,7 @@
 #include <setjmp.h>
 #include <stdio.h>
 #include "config.h"
+#include "ntp_workimpl.h"
 #include "ntp_types.h"
 #include "sntptest.h"
 #include "ntp_stdlib.h"
@@ -56,11 +57,11 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("kodDatabase.c");
-  RUN_TEST(test_SingleEntryHandling, 13);
-  RUN_TEST(test_MultipleEntryHandling, 14);
-  RUN_TEST(test_NoMatchInSearch, 15);
-  RUN_TEST(test_AddDuplicate, 16);
-  RUN_TEST(test_DeleteEntry, 17);
+  RUN_TEST(test_SingleEntryHandling, 18);
+  RUN_TEST(test_MultipleEntryHandling, 19);
+  RUN_TEST(test_NoMatchInSearch, 20);
+  RUN_TEST(test_AddDuplicate, 21);
+  RUN_TEST(test_DeleteEntry, 22);
 
   return (UnityEnd());
 }
diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c
index e6ec758b1..8d1234570 100644
--- a/sntp/tests/run-t-log.c
+++ b/sntp/tests/run-t-log.c
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("t-log.c");
-  RUN_TEST(testChangePrognameInMysyslog, 9);
-  RUN_TEST(testOpenLogfileTest, 10);
-  RUN_TEST(testWriteInCustomLogfile, 11);
+  RUN_TEST(testChangePrognameInMysyslog, 10);
+  RUN_TEST(testOpenLogfileTest, 11);
+  RUN_TEST(testWriteInCustomLogfile, 12);
 
   return (UnityEnd());
 }
diff --git a/sntp/tests/t-log.c b/sntp/tests/t-log.c
index fd508e445..6975b1a21 100644
--- a/sntp/tests/t-log.c
+++ b/sntp/tests/t-log.c
@@ -6,34 +6,50 @@
 //#include "log.h"
 #include "log.c"
 
+void setUp(void);
 void testChangePrognameInMysyslog(void);
 void testOpenLogfileTest(void);
 void testWriteInCustomLogfile(void);
 
 
+void
+setUp(void) {
+	init_lib();
+}
+
+
 //in var/log/syslog (may differ depending on your OS), logged name of the program will be "TEST_PROGNAME".
 
-void testChangePrognameInMysyslog(void){
+void
+testChangePrognameInMysyslog(void)
+{
 	sntp_init_logging("TEST_PROGNAME");
-	msyslog(LOG_ERR, "TESTING sntp_init_logging()"); //%m will print the last errno?
+	msyslog(LOG_ERR, "TESTING sntp_init_logging()");
+
+	return;
 }
 
 //writes log files in your own file instead of syslog! (MAY BE USEFUL TO SUPPRESS ERROR MESSAGES!)
 
-void testOpenLogfileTest(void){
+void
+testOpenLogfileTest(void)
+{
 	sntp_init_logging("TEST_PROGNAME2"); //this name is consistent through the entire program unless changed
-	open_logfile("testLogfile.log"); 
+	open_logfile("testLogfile.log");
 	//open_logfile("/var/log/syslog"); //this gives me "Permission Denied" when i do %m
-	
+
 	msyslog(LOG_ERR, "Cannot open log file %s","abcXX");
 	//cleanup_log(); //unnecessary  after log.c fix!
-	
+
+	return;
 }
 
 
 //multiple cleanup_log() causes segfault. Probably the reason it's static. Opening multiple open_logfile(name) will cause segfault x.x I'm guessing it's not intended to be changed. Cleanup after unity test doesn't fix it, looks like. Calling in tearDown() also causes issues.
 
-void testWriteInCustomLogfile(void){
+void
+testWriteInCustomLogfile(void)
+{
 	char testString[256] = "12345 ABC";
 	char testName[256] = "TEST_PROGNAME3";
 
@@ -43,27 +59,27 @@ void testWriteInCustomLogfile(void){
 	open_logfile("testLogfile2.log"); // ./ causing issues
 	//sntp_init_logging(testName);
 
-	
+
 	msyslog(LOG_ERR, "%s", testString);
 	FILE * f = fopen("testLogfile2.log","r");
 	char line[256];
 
 	//should be only 1 line
- 	while (fgets(line, sizeof(line), f)) {
-        	printf("%s", line); 
-    	}
-	
+	while (fgets(line, sizeof(line), f)) {
+		printf("%s", line);
+	}
+
 
 	char* x = strstr(line,testName);
-	
+
 	TEST_ASSERT_TRUE( x != NULL);
 
 	x = strstr(line,testString);
 	TEST_ASSERT_TRUE( x != NULL);
 	//cleanup_log();
-	fclose(f); //using this will also cause segfault, because at the end, log.c will  call (using atexit(func) function) cleanup_log(void)-> fclose(syslog_file); 
+	fclose(f); //using this will also cause segfault, because at the end, log.c will  call (using atexit(func) function) cleanup_log(void)-> fclose(syslog_file);
 	//After the 1st fclose, syslog_file = NULL, and is never reset -> hopefully fixed by editing log.c
 	//TEST_ASSERT_EQUAL_STRING(testString,line); //doesn't work, line is dynamic because the process name is random.
-}
-
 
+	return;
+}
diff --git a/tests/libntp/calendar.c b/tests/libntp/calendar.c
index 87619802d..0aff0e699 100644
--- a/tests/libntp/calendar.c
+++ b/tests/libntp/calendar.c
@@ -8,6 +8,7 @@
 
 static int leapdays(int year);
 
+void	setUp(void);
 int	isGT(int first, int second);
 int	leapdays(int year);
 char *	CalendarFromCalToString(const struct calendar *cal);
@@ -34,6 +35,16 @@ void	test_IsoCalWeeksToYearStart(void);
 void	test_IsoCalWeeksToYearEnd(void);
 void	test_DaySecToDate(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 /*
  * ---------------------------------------------------------------------
  * test support stuff
diff --git a/tests/libntp/caljulian.c b/tests/libntp/caljulian.c
index f1eb3538d..30ceaaec0 100644
--- a/tests/libntp/caljulian.c
+++ b/tests/libntp/caljulian.c
@@ -72,6 +72,7 @@ setUp()
 {
     ntpcal_set_timefunc(timefunc);
     settime(1970, 1, 1, 0, 0, 0);
+    init_lib();
 
     return;
 }
diff --git a/tests/libntp/decodenetnum.c b/tests/libntp/decodenetnum.c
index 0e9bc3492..0d2b0b54e 100644
--- a/tests/libntp/decodenetnum.c
+++ b/tests/libntp/decodenetnum.c
@@ -4,6 +4,7 @@
 
 #include "unity.h"
 
+void setUp(void);
 extern void test_IPv4AddressOnly(void);
 extern void test_IPv4AddressWithPort(void);
 //#ifdef ISC_PLATFORM_HAVEIPV6
@@ -14,6 +15,15 @@ extern void test_IllegalAddress(void);
 extern void test_IllegalCharInPort(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_IPv4AddressOnly(void) {
 	const char *str = "192.0.2.1";
diff --git a/tests/libntp/humandate.c b/tests/libntp/humandate.c
index 31758c187..de3c751c8 100644
--- a/tests/libntp/humandate.c
+++ b/tests/libntp/humandate.c
@@ -5,10 +5,20 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_RegularTime(void);
 void test_CurrentTime(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_RegularTime(void)
 {
diff --git a/tests/libntp/lfptostr.c b/tests/libntp/lfptostr.c
index 142e6c772..ed3285378 100644
--- a/tests/libntp/lfptostr.c
+++ b/tests/libntp/lfptostr.c
@@ -20,6 +20,7 @@ static const int HALF_PROMILLE_UP = 2147484; /* slightly more than 0.0005 */
 static const int HALF_PROMILLE_DOWN = 2147483; /* slightly less than 0.0005 */
 
 
+void setUp(void);
 void test_PositiveInteger(void);
 void test_NegativeInteger(void);
 void test_PositiveIntegerWithFraction(void);
@@ -33,6 +34,14 @@ void test_MillisecondsRoundingDown(void);
 void test_UnsignedInteger(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
 
 void
 test_PositiveInteger(void) {
diff --git a/tests/libntp/modetoa.c b/tests/libntp/modetoa.c
index 267b44e01..03b384c1d 100644
--- a/tests/libntp/modetoa.c
+++ b/tests/libntp/modetoa.c
@@ -4,10 +4,20 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_KnownMode(void);
 void test_UnknownMode(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_KnownMode(void) {
 	const int MODE = 3; // Should be "client"
diff --git a/tests/libntp/msyslog.c b/tests/libntp/msyslog.c
index dec8d8592..987c81425 100644
--- a/tests/libntp/msyslog.c
+++ b/tests/libntp/msyslog.c
@@ -10,6 +10,7 @@ void format_errmsg(char *, size_t, const char *, int);
 #endif
 
 
+void setUp(void);
 void test_msnprintf(void);
 void test_msnprintfLiteralPercentm(void);
 void test_msnprintfBackslashLiteralPercentm(void);
@@ -20,6 +21,15 @@ void test_msnprintfNullTarget(void);
 void test_msnprintfTruncate(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_msnprintf(void) {
 #define FMT_PREFIX "msyslog.cpp ENOENT: "
diff --git a/tests/libntp/netof.c b/tests/libntp/netof.c
index dc0e5a200..59dd7098d 100644
--- a/tests/libntp/netof.c
+++ b/tests/libntp/netof.c
@@ -8,12 +8,22 @@
 #include "sockaddrtest.h"
 
 
+void setUp(void);
 void test_ClassBAddress(void);
 void test_ClassCAddress(void);
 void test_ClassAAddress(void);
 void test_IPv6Address(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_ClassBAddress(void)
 {
diff --git a/tests/libntp/numtoa.c b/tests/libntp/numtoa.c
index 5c7a663f4..42638b628 100644
--- a/tests/libntp/numtoa.c
+++ b/tests/libntp/numtoa.c
@@ -5,9 +5,20 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_Address(void);
 void test_Netmask(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_Address(void) {
 	const u_int32 input = htonl(3221225472UL + 512UL + 1UL); // 192.0.2.1
diff --git a/tests/libntp/numtohost.c b/tests/libntp/numtohost.c
index 4eb32eec5..1c095eb55 100644
--- a/tests/libntp/numtohost.c
+++ b/tests/libntp/numtohost.c
@@ -5,8 +5,19 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_LoopbackNetNonResolve(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_LoopbackNetNonResolve(void) {
 	/* A loopback address in 127.0.0.0/8 is chosen, and
diff --git a/tests/libntp/prettydate.c b/tests/libntp/prettydate.c
index 981e14699..c940e2a2d 100644
--- a/tests/libntp/prettydate.c
+++ b/tests/libntp/prettydate.c
@@ -6,9 +6,19 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_ConstantDate(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_ConstantDate(void) {
 	const u_int32 HALF = 2147483648UL;
diff --git a/tests/libntp/recvbuff.c b/tests/libntp/recvbuff.c
index b9299d2e4..6c089bb4c 100644
--- a/tests/libntp/recvbuff.c
+++ b/tests/libntp/recvbuff.c
@@ -13,6 +13,9 @@ void
 setUp(void)
 {
 	init_recvbuff(RECV_INIT);
+	init_lib();
+
+	return;
 }
 
 void
diff --git a/tests/libntp/refidsmear.c b/tests/libntp/refidsmear.c
index ad431c1a1..da1ebff20 100644
--- a/tests/libntp/refidsmear.c
+++ b/tests/libntp/refidsmear.c
@@ -29,11 +29,21 @@
  */
 
 
+void setUp(void);
 void rtol(uint32_t r, char *es);
 void rtoltor(uint32_t er, char *es);
 void ltor(l_fp l, char *er);
 void test_refidsmear(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
 void
 rtol(uint32_t r, char *es)
 {
diff --git a/tests/libntp/refnumtoa.c b/tests/libntp/refnumtoa.c
index 8fe71045e..9db5fb11d 100644
--- a/tests/libntp/refnumtoa.c
+++ b/tests/libntp/refnumtoa.c
@@ -9,10 +9,20 @@
 /* Might need to be updated if a new refclock gets this id. */
 static const int UNUSED_REFCLOCK_ID = 250;
 
+void setUp(void);
 void test_LocalClock(void);
 void test_UnknownId(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_LocalClock(void) {
 #ifdef REFCLOCK		/* clockname() is useless otherwise */
diff --git a/tests/libntp/run-calendar.c b/tests/libntp/run-calendar.c
index 50c5b2014..555f3ba6d 100644
--- a/tests/libntp/run-calendar.c
+++ b/tests/libntp/run-calendar.c
@@ -63,21 +63,21 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("calendar.c");
-  RUN_TEST(test_DaySplitMerge, 21);
-  RUN_TEST(test_SplitYearDays1, 22);
-  RUN_TEST(test_SplitYearDays2, 23);
-  RUN_TEST(test_RataDie1, 24);
-  RUN_TEST(test_LeapYears1, 25);
-  RUN_TEST(test_LeapYears2, 26);
-  RUN_TEST(test_RoundTripDate, 27);
-  RUN_TEST(test_RoundTripYearStart, 28);
-  RUN_TEST(test_RoundTripMonthStart, 29);
-  RUN_TEST(test_RoundTripWeekStart, 30);
-  RUN_TEST(test_RoundTripDayStart, 31);
-  RUN_TEST(test_IsoCalYearsToWeeks, 32);
-  RUN_TEST(test_IsoCalWeeksToYearStart, 33);
-  RUN_TEST(test_IsoCalWeeksToYearEnd, 34);
-  RUN_TEST(test_DaySecToDate, 35);
+  RUN_TEST(test_DaySplitMerge, 22);
+  RUN_TEST(test_SplitYearDays1, 23);
+  RUN_TEST(test_SplitYearDays2, 24);
+  RUN_TEST(test_RataDie1, 25);
+  RUN_TEST(test_LeapYears1, 26);
+  RUN_TEST(test_LeapYears2, 27);
+  RUN_TEST(test_RoundTripDate, 28);
+  RUN_TEST(test_RoundTripYearStart, 29);
+  RUN_TEST(test_RoundTripMonthStart, 30);
+  RUN_TEST(test_RoundTripWeekStart, 31);
+  RUN_TEST(test_RoundTripDayStart, 32);
+  RUN_TEST(test_IsoCalYearsToWeeks, 33);
+  RUN_TEST(test_IsoCalWeeksToYearStart, 34);
+  RUN_TEST(test_IsoCalWeeksToYearEnd, 35);
+  RUN_TEST(test_DaySecToDate, 36);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-decodenetnum.c b/tests/libntp/run-decodenetnum.c
index 014151e98..57b955c2a 100644
--- a/tests/libntp/run-decodenetnum.c
+++ b/tests/libntp/run-decodenetnum.c
@@ -53,12 +53,12 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("decodenetnum.c");
-  RUN_TEST(test_IPv4AddressOnly, 7);
-  RUN_TEST(test_IPv4AddressWithPort, 8);
-  RUN_TEST(test_IPv6AddressOnly, 10);
-  RUN_TEST(test_IPv6AddressWithPort, 11);
-  RUN_TEST(test_IllegalAddress, 13);
-  RUN_TEST(test_IllegalCharInPort, 14);
+  RUN_TEST(test_IPv4AddressOnly, 8);
+  RUN_TEST(test_IPv4AddressWithPort, 9);
+  RUN_TEST(test_IPv6AddressOnly, 11);
+  RUN_TEST(test_IPv6AddressWithPort, 12);
+  RUN_TEST(test_IllegalAddress, 14);
+  RUN_TEST(test_IllegalCharInPort, 15);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-humandate.c b/tests/libntp/run-humandate.c
index 1f2e717c6..690895fdd 100644
--- a/tests/libntp/run-humandate.c
+++ b/tests/libntp/run-humandate.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("humandate.c");
-  RUN_TEST(test_RegularTime, 8);
-  RUN_TEST(test_CurrentTime, 9);
+  RUN_TEST(test_RegularTime, 9);
+  RUN_TEST(test_CurrentTime, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-lfptostr.c b/tests/libntp/run-lfptostr.c
index bae0f85b1..fbdeb7a1d 100644
--- a/tests/libntp/run-lfptostr.c
+++ b/tests/libntp/run-lfptostr.c
@@ -58,17 +58,17 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("lfptostr.c");
-  RUN_TEST(test_PositiveInteger, 23);
-  RUN_TEST(test_NegativeInteger, 24);
-  RUN_TEST(test_PositiveIntegerWithFraction, 25);
-  RUN_TEST(test_NegativeIntegerWithFraction, 26);
-  RUN_TEST(test_RoundingDownToInteger, 27);
-  RUN_TEST(test_RoundingMiddleToInteger, 28);
-  RUN_TEST(test_RoundingUpToInteger, 29);
-  RUN_TEST(test_SingleDecimal, 30);
-  RUN_TEST(test_MillisecondsRoundingUp, 31);
-  RUN_TEST(test_MillisecondsRoundingDown, 32);
-  RUN_TEST(test_UnsignedInteger, 33);
+  RUN_TEST(test_PositiveInteger, 24);
+  RUN_TEST(test_NegativeInteger, 25);
+  RUN_TEST(test_PositiveIntegerWithFraction, 26);
+  RUN_TEST(test_NegativeIntegerWithFraction, 27);
+  RUN_TEST(test_RoundingDownToInteger, 28);
+  RUN_TEST(test_RoundingMiddleToInteger, 29);
+  RUN_TEST(test_RoundingUpToInteger, 30);
+  RUN_TEST(test_SingleDecimal, 31);
+  RUN_TEST(test_MillisecondsRoundingUp, 32);
+  RUN_TEST(test_MillisecondsRoundingDown, 33);
+  RUN_TEST(test_UnsignedInteger, 34);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-modetoa.c b/tests/libntp/run-modetoa.c
index 20e2d9516..0c1558e6d 100644
--- a/tests/libntp/run-modetoa.c
+++ b/tests/libntp/run-modetoa.c
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("modetoa.c");
-  RUN_TEST(test_KnownMode, 7);
-  RUN_TEST(test_UnknownMode, 8);
+  RUN_TEST(test_KnownMode, 8);
+  RUN_TEST(test_UnknownMode, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-msyslog.c b/tests/libntp/run-msyslog.c
index 544fbc119..ff264f833 100644
--- a/tests/libntp/run-msyslog.c
+++ b/tests/libntp/run-msyslog.c
@@ -54,14 +54,14 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("msyslog.c");
-  RUN_TEST(test_msnprintf, 13);
-  RUN_TEST(test_msnprintfLiteralPercentm, 14);
-  RUN_TEST(test_msnprintfBackslashLiteralPercentm, 15);
-  RUN_TEST(test_msnprintfBackslashPercent, 16);
-  RUN_TEST(test_msnprintfHangingPercent, 17);
-  RUN_TEST(test_format_errmsgHangingPercent, 18);
-  RUN_TEST(test_msnprintfNullTarget, 19);
-  RUN_TEST(test_msnprintfTruncate, 20);
+  RUN_TEST(test_msnprintf, 14);
+  RUN_TEST(test_msnprintfLiteralPercentm, 15);
+  RUN_TEST(test_msnprintfBackslashLiteralPercentm, 16);
+  RUN_TEST(test_msnprintfBackslashPercent, 17);
+  RUN_TEST(test_msnprintfHangingPercent, 18);
+  RUN_TEST(test_format_errmsgHangingPercent, 19);
+  RUN_TEST(test_msnprintfNullTarget, 20);
+  RUN_TEST(test_msnprintfTruncate, 21);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index 7a714f54e..9301b84b3 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("netof.c");
-  RUN_TEST(test_ClassBAddress, 11);
-  RUN_TEST(test_ClassCAddress, 12);
-  RUN_TEST(test_ClassAAddress, 13);
-  RUN_TEST(test_IPv6Address, 14);
+  RUN_TEST(test_ClassBAddress, 12);
+  RUN_TEST(test_ClassCAddress, 13);
+  RUN_TEST(test_ClassAAddress, 14);
+  RUN_TEST(test_IPv6Address, 15);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c
index 640e61c14..f3368a721 100644
--- a/tests/libntp/run-numtoa.c
+++ b/tests/libntp/run-numtoa.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("numtoa.c");
-  RUN_TEST(test_Address, 8);
-  RUN_TEST(test_Netmask, 9);
+  RUN_TEST(test_Address, 9);
+  RUN_TEST(test_Netmask, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
index 5ebe15b8f..49b52640b 100644
--- a/tests/libntp/run-numtohost.c
+++ b/tests/libntp/run-numtohost.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("numtohost.c");
-  RUN_TEST(test_LoopbackNetNonResolve, 8);
+  RUN_TEST(test_LoopbackNetNonResolve, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c
index e6c5ff3f6..e034cc2af 100644
--- a/tests/libntp/run-prettydate.c
+++ b/tests/libntp/run-prettydate.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("prettydate.c");
-  RUN_TEST(test_ConstantDate, 9);
+  RUN_TEST(test_ConstantDate, 10);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 1c128e782..465690f76 100644
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("refidsmear.c");
-  RUN_TEST(test_refidsmear, 35);
+  RUN_TEST(test_refidsmear, 36);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index bb9fb605b..d829580b0 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("refnumtoa.c");
-  RUN_TEST(test_LocalClock, 12);
-  RUN_TEST(test_UnknownId, 13);
+  RUN_TEST(test_LocalClock, 13);
+  RUN_TEST(test_UnknownId, 14);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index 1ebe43ca7..bae4e5f48 100644
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -54,14 +54,14 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("sfptostr.c");
-  RUN_TEST(test_PositiveInteger, 11);
-  RUN_TEST(test_NegativeInteger, 12);
-  RUN_TEST(test_PositiveIntegerPositiveFraction, 13);
-  RUN_TEST(test_NegativeIntegerNegativeFraction, 14);
-  RUN_TEST(test_PositiveIntegerNegativeFraction, 15);
-  RUN_TEST(test_NegativeIntegerPositiveFraction, 16);
-  RUN_TEST(test_SingleDecimalInteger, 17);
-  RUN_TEST(test_SingleDecimalRounding, 18);
+  RUN_TEST(test_PositiveInteger, 12);
+  RUN_TEST(test_NegativeInteger, 13);
+  RUN_TEST(test_PositiveIntegerPositiveFraction, 14);
+  RUN_TEST(test_NegativeIntegerNegativeFraction, 15);
+  RUN_TEST(test_PositiveIntegerNegativeFraction, 16);
+  RUN_TEST(test_NegativeIntegerPositiveFraction, 17);
+  RUN_TEST(test_SingleDecimalInteger, 18);
+  RUN_TEST(test_SingleDecimalRounding, 19);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c
index a5066e3f7..df6ec9c06 100644
--- a/tests/libntp/run-socktoa.c
+++ b/tests/libntp/run-socktoa.c
@@ -54,12 +54,12 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("socktoa.c");
-  RUN_TEST(test_IPv4AddressWithPort, 10);
-  RUN_TEST(test_IPv6AddressWithPort, 12);
-  RUN_TEST(test_IgnoreIPv6Fields, 13);
-  RUN_TEST(test_ScopedIPv6AddressWithPort, 15);
-  RUN_TEST(test_HashEqual, 16);
-  RUN_TEST(test_HashNotEqual, 17);
+  RUN_TEST(test_IPv4AddressWithPort, 11);
+  RUN_TEST(test_IPv6AddressWithPort, 13);
+  RUN_TEST(test_IgnoreIPv6Fields, 14);
+  RUN_TEST(test_ScopedIPv6AddressWithPort, 16);
+  RUN_TEST(test_HashEqual, 17);
+  RUN_TEST(test_HashNotEqual, 18);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c
index 9cfe0bc9f..f0f93861e 100644
--- a/tests/libntp/run-statestr.c
+++ b/tests/libntp/run-statestr.c
@@ -52,10 +52,10 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("statestr.c");
-  RUN_TEST(test_PeerRestart, 9);
-  RUN_TEST(test_SysUnspecified, 10);
-  RUN_TEST(test_ClockCodeExists, 11);
-  RUN_TEST(test_ClockCodeUnknown, 12);
+  RUN_TEST(test_PeerRestart, 10);
+  RUN_TEST(test_SysUnspecified, 11);
+  RUN_TEST(test_ClockCodeExists, 12);
+  RUN_TEST(test_ClockCodeUnknown, 13);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c
index 74723192c..404f57f11 100644
--- a/tests/libntp/run-strtolfp.c
+++ b/tests/libntp/run-strtolfp.c
@@ -55,13 +55,13 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("strtolfp.c");
-  RUN_TEST(test_PositiveInteger, 11);
-  RUN_TEST(test_NegativeInteger, 12);
-  RUN_TEST(test_PositiveFraction, 13);
-  RUN_TEST(test_NegativeFraction, 14);
-  RUN_TEST(test_PositiveMsFraction, 15);
-  RUN_TEST(test_NegativeMsFraction, 16);
-  RUN_TEST(test_InvalidChars, 17);
+  RUN_TEST(test_PositiveInteger, 12);
+  RUN_TEST(test_NegativeInteger, 13);
+  RUN_TEST(test_PositiveFraction, 14);
+  RUN_TEST(test_NegativeFraction, 15);
+  RUN_TEST(test_PositiveMsFraction, 16);
+  RUN_TEST(test_NegativeMsFraction, 17);
+  RUN_TEST(test_InvalidChars, 18);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index 6c26521f0..badc84a9b 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -78,34 +78,34 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("timespecops.c");
-  RUN_TEST(test_Helpers1, 36);
-  RUN_TEST(test_Normalise, 37);
-  RUN_TEST(test_SignNoFrac, 38);
-  RUN_TEST(test_SignWithFrac, 39);
-  RUN_TEST(test_CmpFracEQ, 40);
-  RUN_TEST(test_CmpFracGT, 41);
-  RUN_TEST(test_CmpFracLT, 42);
-  RUN_TEST(test_AddFullNorm, 43);
-  RUN_TEST(test_AddFullOflow1, 44);
-  RUN_TEST(test_AddNsecNorm, 45);
-  RUN_TEST(test_AddNsecOflow1, 46);
-  RUN_TEST(test_SubFullNorm, 47);
-  RUN_TEST(test_SubFullOflow, 48);
-  RUN_TEST(test_SubNsecNorm, 49);
-  RUN_TEST(test_SubNsecOflow, 50);
-  RUN_TEST(test_Neg, 51);
-  RUN_TEST(test_AbsNoFrac, 52);
-  RUN_TEST(test_AbsWithFrac, 53);
-  RUN_TEST(test_Helpers2, 54);
-  RUN_TEST(test_ToLFPbittest, 55);
-  RUN_TEST(test_ToLFPrelPos, 56);
-  RUN_TEST(test_ToLFPrelNeg, 57);
-  RUN_TEST(test_ToLFPabs, 58);
-  RUN_TEST(test_FromLFPbittest, 59);
-  RUN_TEST(test_FromLFPrelPos, 60);
-  RUN_TEST(test_FromLFPrelNeg, 61);
-  RUN_TEST(test_LFProundtrip, 62);
-  RUN_TEST(test_ToString, 63);
+  RUN_TEST(test_Helpers1, 37);
+  RUN_TEST(test_Normalise, 38);
+  RUN_TEST(test_SignNoFrac, 39);
+  RUN_TEST(test_SignWithFrac, 40);
+  RUN_TEST(test_CmpFracEQ, 41);
+  RUN_TEST(test_CmpFracGT, 42);
+  RUN_TEST(test_CmpFracLT, 43);
+  RUN_TEST(test_AddFullNorm, 44);
+  RUN_TEST(test_AddFullOflow1, 45);
+  RUN_TEST(test_AddNsecNorm, 46);
+  RUN_TEST(test_AddNsecOflow1, 47);
+  RUN_TEST(test_SubFullNorm, 48);
+  RUN_TEST(test_SubFullOflow, 49);
+  RUN_TEST(test_SubNsecNorm, 50);
+  RUN_TEST(test_SubNsecOflow, 51);
+  RUN_TEST(test_Neg, 52);
+  RUN_TEST(test_AbsNoFrac, 53);
+  RUN_TEST(test_AbsWithFrac, 54);
+  RUN_TEST(test_Helpers2, 55);
+  RUN_TEST(test_ToLFPbittest, 56);
+  RUN_TEST(test_ToLFPrelPos, 57);
+  RUN_TEST(test_ToLFPrelNeg, 58);
+  RUN_TEST(test_ToLFPabs, 59);
+  RUN_TEST(test_FromLFPbittest, 60);
+  RUN_TEST(test_FromLFPrelPos, 61);
+  RUN_TEST(test_FromLFPrelNeg, 62);
+  RUN_TEST(test_LFProundtrip, 63);
+  RUN_TEST(test_ToString, 64);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index 4a9351c70..df39ab9c3 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -77,34 +77,34 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("timevalops.c");
-  RUN_TEST(test_Helpers1, 38);
-  RUN_TEST(test_Normalise, 39);
-  RUN_TEST(test_SignNoFrac, 40);
-  RUN_TEST(test_SignWithFrac, 41);
-  RUN_TEST(test_CmpFracEQ, 42);
-  RUN_TEST(test_CmpFracGT, 43);
-  RUN_TEST(test_CmpFracLT, 44);
-  RUN_TEST(test_AddFullNorm, 45);
-  RUN_TEST(test_AddFullOflow1, 46);
-  RUN_TEST(test_AddUsecNorm, 47);
-  RUN_TEST(test_AddUsecOflow1, 48);
-  RUN_TEST(test_SubFullNorm, 49);
-  RUN_TEST(test_SubFullOflow, 50);
-  RUN_TEST(test_SubUsecNorm, 51);
-  RUN_TEST(test_SubUsecOflow, 52);
-  RUN_TEST(test_Neg, 53);
-  RUN_TEST(test_AbsNoFrac, 54);
-  RUN_TEST(test_AbsWithFrac, 55);
-  RUN_TEST(test_Helpers2, 56);
-  RUN_TEST(test_ToLFPbittest, 57);
-  RUN_TEST(test_ToLFPrelPos, 58);
-  RUN_TEST(test_ToLFPrelNeg, 59);
-  RUN_TEST(test_ToLFPabs, 60);
-  RUN_TEST(test_FromLFPbittest, 61);
-  RUN_TEST(test_FromLFPrelPos, 62);
-  RUN_TEST(test_FromLFPrelNeg, 63);
-  RUN_TEST(test_LFProundtrip, 64);
-  RUN_TEST(test_ToString, 65);
+  RUN_TEST(test_Helpers1, 39);
+  RUN_TEST(test_Normalise, 40);
+  RUN_TEST(test_SignNoFrac, 41);
+  RUN_TEST(test_SignWithFrac, 42);
+  RUN_TEST(test_CmpFracEQ, 43);
+  RUN_TEST(test_CmpFracGT, 44);
+  RUN_TEST(test_CmpFracLT, 45);
+  RUN_TEST(test_AddFullNorm, 46);
+  RUN_TEST(test_AddFullOflow1, 47);
+  RUN_TEST(test_AddUsecNorm, 48);
+  RUN_TEST(test_AddUsecOflow1, 49);
+  RUN_TEST(test_SubFullNorm, 50);
+  RUN_TEST(test_SubFullOflow, 51);
+  RUN_TEST(test_SubUsecNorm, 52);
+  RUN_TEST(test_SubUsecOflow, 53);
+  RUN_TEST(test_Neg, 54);
+  RUN_TEST(test_AbsNoFrac, 55);
+  RUN_TEST(test_AbsWithFrac, 56);
+  RUN_TEST(test_Helpers2, 57);
+  RUN_TEST(test_ToLFPbittest, 58);
+  RUN_TEST(test_ToLFPrelPos, 59);
+  RUN_TEST(test_ToLFPrelNeg, 60);
+  RUN_TEST(test_ToLFPabs, 61);
+  RUN_TEST(test_FromLFPbittest, 62);
+  RUN_TEST(test_FromLFPrelPos, 63);
+  RUN_TEST(test_FromLFPrelNeg, 64);
+  RUN_TEST(test_LFProundtrip, 65);
+  RUN_TEST(test_ToString, 66);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-uglydate.c b/tests/libntp/run-uglydate.c
index 6ec50f660..5667b7062 100644
--- a/tests/libntp/run-uglydate.c
+++ b/tests/libntp/run-uglydate.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("uglydate.c");
-  RUN_TEST(test_ConstantDateTime, 8);
+  RUN_TEST(test_ConstantDateTime, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/sfptostr.c b/tests/libntp/sfptostr.c
index b115ae168..290041b5b 100644
--- a/tests/libntp/sfptostr.c
+++ b/tests/libntp/sfptostr.c
@@ -8,6 +8,7 @@
  
 #define SFP_MAX_PRECISION 6
 
+void setUp(void);
 void test_PositiveInteger(void);
 void test_NegativeInteger(void);
 void test_PositiveIntegerPositiveFraction(void);
@@ -18,6 +19,15 @@ void test_SingleDecimalInteger(void);
 void test_SingleDecimalRounding(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void test_PositiveInteger(void)
 {
 	s_fp test = 300 << 16; // exact 300.000000
diff --git a/tests/libntp/socktoa.c b/tests/libntp/socktoa.c
index dc77ecfb4..84231060f 100644
--- a/tests/libntp/socktoa.c
+++ b/tests/libntp/socktoa.c
@@ -7,6 +7,7 @@
 #include "sockaddrtest.h"
 
 
+void setUp(void);
 void test_IPv4AddressWithPort(void);
 //#ifdef ISC_PLATFORM_HAVEIPV6
 void test_IPv6AddressWithPort(void);
@@ -16,6 +17,16 @@ void test_ScopedIPv6AddressWithPort(void);
 void test_HashEqual(void);
 void test_HashNotEqual(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void 
 test_IPv4AddressWithPort(void) {
 	sockaddr_u input = CreateSockaddr4("192.0.2.10", 123);
diff --git a/tests/libntp/statestr.c b/tests/libntp/statestr.c
index 810ee6b6e..e7a1bd7cf 100644
--- a/tests/libntp/statestr.c
+++ b/tests/libntp/statestr.c
@@ -6,11 +6,22 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_PeerRestart(void);
 void test_SysUnspecified(void);
 void test_ClockCodeExists(void);
 void test_ClockCodeUnknown(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 // eventstr()
 void
 test_PeerRestart(void) {
diff --git a/tests/libntp/strtolfp.c b/tests/libntp/strtolfp.c
index f40ab508a..6855d9ba3 100644
--- a/tests/libntp/strtolfp.c
+++ b/tests/libntp/strtolfp.c
@@ -8,6 +8,7 @@
 
 /* This file tests both atolfp and mstolfp */
 
+void setUp(void);
 void test_PositiveInteger(void);
 void test_NegativeInteger(void);
 void test_PositiveFraction(void);
@@ -17,6 +18,15 @@ void test_NegativeMsFraction(void);
 void test_InvalidChars(void);
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void test_PositiveInteger(void) {
 	const char *str = "500";
 	const char *str_ms = "500000";
diff --git a/tests/libntp/timespecops.c b/tests/libntp/timespecops.c
index 676a35857..68a472ab5 100644
--- a/tests/libntp/timespecops.c
+++ b/tests/libntp/timespecops.c
@@ -33,6 +33,7 @@ struct lfpfracdata {
 };
 
 
+void setUp(void);
 void test_Helpers1(void);
 void test_Normalise(void);
 void test_SignNoFrac(void);
@@ -76,6 +77,15 @@ bool		AssertTimespecClose(const struct timespec m,
 //***************************MY CUSTOM FUNCTIONS***************************
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 const bool
 timespec_isValid(struct timespec V)
 {
diff --git a/tests/libntp/timevalops.c b/tests/libntp/timevalops.c
index 32fe4fb01..99a48eb9a 100644
--- a/tests/libntp/timevalops.c
+++ b/tests/libntp/timevalops.c
@@ -35,6 +35,7 @@ l_fp l_fp_init(int32 i, u_int32 f);
 bool AssertTimevalClose(const struct timeval m, const struct timeval n, const struct timeval limit);
 bool AssertFpClose(const l_fp m, const l_fp n, const l_fp limit);
 
+void setUp(void);
 void test_Helpers1(void);
 void test_Normalise(void);
 void test_SignNoFrac(void);
@@ -68,6 +69,15 @@ void test_ToString(void);
 //**********************************MY CUSTOM FUNCTIONS***********************
 
 
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 struct timeval
 timeval_init(time_t hi, long lo)
 {
diff --git a/tests/libntp/uglydate.c b/tests/libntp/uglydate.c
index a044314cb..3a5aa8adb 100644
--- a/tests/libntp/uglydate.c
+++ b/tests/libntp/uglydate.c
@@ -5,14 +5,26 @@
 
 #include "unity.h"
 
+void setUp(void);
 void test_ConstantDateTime(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
 void
-test_ConstantDateTime(void) {
+test_ConstantDateTime(void)
+{
 	const u_int32 HALF = 2147483648UL;
 
 	l_fp e_time = {{3485080800UL}, HALF}; /* 2010-06-09 14:00:00.5 */
 
 	TEST_ASSERT_EQUAL_STRING("3485080800.500000 10:159:14:00:00.500",
 				 uglydate(&e_time));
+	return;
 }
diff --git a/tests/sandbox/run-uglydate.c b/tests/sandbox/run-uglydate.c
index be0a768fe..e65cd0109 100644
--- a/tests/sandbox/run-uglydate.c
+++ b/tests/sandbox/run-uglydate.c
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("uglydate.c");
-  RUN_TEST(test_ConstantDateTime, 8);
+  RUN_TEST(test_ConstantDateTime, 9);
 
   return (UnityEnd());
 }
diff --git a/tests/sandbox/smeartest.c b/tests/sandbox/smeartest.c
index 98fa51f2d..6954d9e5d 100644
--- a/tests/sandbox/smeartest.c
+++ b/tests/sandbox/smeartest.c
@@ -131,6 +131,8 @@ main()
 	l_fp l;
 	int rc;
 
+	init_lib();
+
 	rtol(0xfe800000);
 	rtol(0xfe800001);
 	rtol(0xfe8ffffe);
diff --git a/tests/sandbox/uglydate.c b/tests/sandbox/uglydate.c
index 394d59436..77f36c558 100644
--- a/tests/sandbox/uglydate.c
+++ b/tests/sandbox/uglydate.c
@@ -5,8 +5,19 @@
 //#include "ntp_stdlib.h"
 //#include "libntptest.h"
 
+void setUp(void);
 void test_ConstantDateTime(void);
 
+
+void
+setUp(void)
+{
+	init_lib();
+
+	return;
+}
+
+
 void
 test_ConstantDateTime(void)
 {