From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 9 Dec 2017 09:39:12 +0000 (+0100)
Subject: [Bug 2878] Tests are cluttering up syslog
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38e5f89405c00536b336bb767dcd65a05db17b80;p=thirdparty%2Fntp.git

[Bug 2878] Tests are cluttering up syslog

bk: 5a2baf40ayTfFNlHiU3ouE0vkg7eqQ
---

diff --git a/ChangeLog b/ChangeLog
index 4aca479ad..2d5086737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@
 * [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
 * [Bug 3016] wrong error position reported for bad ":config pool"
   - fixed location counter & ntpq output <perlinger@ntp.org>
+* [Bug 2878] Tests are cluttering up syslog <perlinger@ntp.org>
 * [Bug 2737] Wrong phone number listed for USNO. ntp-bugs@bodosom.net,
   perlinger@ntp.org
 * [Bug 2557] Fix Thunderbolt init. ntp-bugs@bodosom.net, perlinger@ntp.
diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index f7e48154d..81dfe09e7 100644
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -22,10 +22,11 @@ DISTCLEANFILES =		\
 	$(NULL)
 
 std_unity_list =					\
-	$(srcdir)/../unity/auto/generate_test_runner.rb	\
+	$(top_srcdir)/unity/auto/generate_test_runner.rb\
+	$(srcdir)/testconf.yml				\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 # Use EXTRA_PROGRAMS for test files that are under development but
 # not production-ready
diff --git a/sntp/tests/run-crypto.c b/sntp/tests/run-crypto.c
index ab7fb1ffc..0d4e94d55 100644
--- a/sntp/tests/run-crypto.c
+++ b/sntp/tests/run-crypto.c
@@ -40,6 +40,13 @@ extern void test_VerifyFailure(void);
 extern void test_PacketSizeNotMultipleOfFourBytes(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -55,6 +62,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("crypto.c");
   RUN_TEST(test_MakeMd5Mac, 15);
   RUN_TEST(test_MakeSHA1Mac, 16);
diff --git a/sntp/tests/run-keyFile.c b/sntp/tests/run-keyFile.c
index 862910903..6c1848e66 100644
--- a/sntp/tests/run-keyFile.c
+++ b/sntp/tests/run-keyFile.c
@@ -38,6 +38,13 @@ extern void test_ReadKeyFileWithComments(void);
 extern void test_ReadKeyFileWithInvalidHex(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -53,6 +60,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("keyFile.c");
   RUN_TEST(test_ReadEmptyKeyFile, 12);
   RUN_TEST(test_ReadASCIIKeys, 13);
diff --git a/sntp/tests/run-kodDatabase.c b/sntp/tests/run-kodDatabase.c
index f655a6adb..0d86ee30f 100644
--- a/sntp/tests/run-kodDatabase.c
+++ b/sntp/tests/run-kodDatabase.c
@@ -41,6 +41,13 @@ extern void test_AddDuplicate(void);
 extern void test_DeleteEntry(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -56,6 +63,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("kodDatabase.c");
   RUN_TEST(test_SingleEntryHandling, 14);
   RUN_TEST(test_MultipleEntryHandling, 15);
diff --git a/sntp/tests/run-kodFile.c b/sntp/tests/run-kodFile.c
index 394355039..07a32d724 100644
--- a/sntp/tests/run-kodFile.c
+++ b/sntp/tests/run-kodFile.c
@@ -39,6 +39,13 @@ extern void test_WriteFileWithSingleEntry(void);
 extern void test_WriteFileWithMultipleEntries(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -54,6 +61,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("kodFile.c");
   RUN_TEST(test_ReadEmptyFile, 19);
   RUN_TEST(test_ReadCorrectFile, 20);
diff --git a/sntp/tests/run-networking.c b/sntp/tests/run-networking.c
index 70caaa034..0083ec392 100644
--- a/sntp/tests/run-networking.c
+++ b/sntp/tests/run-networking.c
@@ -31,6 +31,13 @@ extern void setUp(void);
 extern void tearDown(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -46,6 +53,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("networking.c");
 
   return (UnityEnd());
diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c
index bc20d7f48..4cca13b53 100644
--- a/sntp/tests/run-packetHandling.c
+++ b/sntp/tests/run-packetHandling.c
@@ -47,6 +47,13 @@ extern void test_HandleKodRate(void);
 extern void test_HandleCorrectPacket(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -62,6 +69,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("packetHandling.c");
   RUN_TEST(test_GenerateUnauthenticatedPacket, 17);
   RUN_TEST(test_GenerateAuthenticatedPacket, 18);
diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c
index 54b358232..50144ed36 100644
--- a/sntp/tests/run-packetProcessing.c
+++ b/sntp/tests/run-packetProcessing.c
@@ -51,6 +51,13 @@ extern void test_CorrectAuthenticatedPacketSHA1(void);
 extern void test_CorrectAuthenticatedPacketCMAC(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -66,6 +73,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("packetProcessing.c");
   RUN_TEST(test_TooShortLength, 23);
   RUN_TEST(test_LengthNotMultipleOfFour, 24);
diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c
index 8d1234570..3532c4e0e 100644
--- a/sntp/tests/run-t-log.c
+++ b/sntp/tests/run-t-log.c
@@ -33,6 +33,13 @@ extern void testOpenLogfileTest(void);
 extern void testWriteInCustomLogfile(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("t-log.c");
   RUN_TEST(testChangePrognameInMysyslog, 10);
   RUN_TEST(testOpenLogfileTest, 11);
diff --git a/sntp/tests/run-utilities.c b/sntp/tests/run-utilities.c
index 7c2237bbe..0f3884517 100644
--- a/sntp/tests/run-utilities.c
+++ b/sntp/tests/run-utilities.c
@@ -41,6 +41,13 @@ extern void test_LfpOutputBinaryFormat(void);
 extern void test_LfpOutputDecimalFormat(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -56,6 +63,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("utilities.c");
   RUN_TEST(test_IPv4Address, 16);
   RUN_TEST(test_IPv6Address, 17);
diff --git a/sntp/tests/testconf.yml b/sntp/tests/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/sntp/tests/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/sntp/unity/auto/generate_test_runner.rb b/sntp/unity/auto/generate_test_runner.rb
index 5b1d45190..b4f424df7 100644
--- a/sntp/unity/auto/generate_test_runner.rb
+++ b/sntp/unity/auto/generate_test_runner.rb
@@ -246,7 +246,7 @@ class UnityTestRunnerGenerator
   def create_suite_setup_and_teardown(output)
     unless (@options[:suite_setup].nil?)
       output.puts("\n//=======Suite Setup=====")
-      output.puts("static int suite_setup(void)")
+      output.puts("static void suite_setup(void)")
       output.puts("{")
       output.puts(@options[:suite_setup])
       output.puts("}")
diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am
index d679ac47b..2943815c6 100644
--- a/tests/bug-2803/Makefile.am
+++ b/tests/bug-2803/Makefile.am
@@ -5,9 +5,10 @@ CLEANFILES =
 
 std_unity_list = 						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS = bug-2803
 
diff --git a/tests/bug-2803/run-bug-2803.c b/tests/bug-2803/run-bug-2803.c
index f4066f25f..b25e36253 100644
--- a/tests/bug-2803/run-bug-2803.c
+++ b/tests/bug-2803/run-bug-2803.c
@@ -32,9 +32,15 @@
 extern void setUp(void);
 extern void tearDown(void);
 extern void test_main(void);
-extern void test_main(void );
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -50,9 +56,9 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("bug-2803.c");
   RUN_TEST(test_main, 18);
-  RUN_TEST(test_main, 18);
 
   return (UnityEnd());
 }
diff --git a/tests/bug-2803/testconf.yml b/tests/bug-2803/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/bug-2803/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/bug-3102/testconf.yml b/tests/bug-3102/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/bug-3102/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 0d76af026..e4e155ec3 100644
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -4,9 +4,10 @@ CLEANFILES =
 
 std_unity_list = 						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS =		\
 	test-a_md5encrypt	\
@@ -51,12 +52,12 @@ check_PROGRAMS =		\
 	$(NULL)
 
 LDADD =					\
+	$(top_builddir)/sntp/unity/libunity.a	\
 	$(top_builddir)/libntp/libntp.a	\
 	$(LDADD_LIBNTP)			\
 	$(PTHREAD_LIBS)			\
 	$(LDADD_NTP)			\
 	$(LIBM)				\
-	$(top_builddir)/sntp/unity/libunity.a	\
 	$(NULL)
 
 AM_CFLAGS  = $(CFLAGS_NTP)
diff --git a/tests/libntp/run-a_md5encrypt.c b/tests/libntp/run-a_md5encrypt.c
index a4bfa36dc..332f0e2d1 100644
--- a/tests/libntp/run-a_md5encrypt.c
+++ b/tests/libntp/run-a_md5encrypt.c
@@ -36,6 +36,13 @@ extern void test_IPv4AddressToRefId(void);
 extern void test_IPv6AddressToRefId(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -51,6 +58,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("a_md5encrypt.c");
   RUN_TEST(test_Encrypt, 40);
   RUN_TEST(test_DecryptValid, 41);
diff --git a/tests/libntp/run-atoint.c b/tests/libntp/run-atoint.c
index e8405fd7d..9212c81cb 100644
--- a/tests/libntp/run-atoint.c
+++ b/tests/libntp/run-atoint.c
@@ -37,6 +37,13 @@ extern void test_PositiveOverflowBig(void);
 extern void test_IllegalCharacter(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("atoint.c");
   RUN_TEST(test_RegularPositive, 7);
   RUN_TEST(test_RegularNegative, 8);
diff --git a/tests/libntp/run-atouint.c b/tests/libntp/run-atouint.c
index b7c17320a..9597a7658 100644
--- a/tests/libntp/run-atouint.c
+++ b/tests/libntp/run-atouint.c
@@ -37,6 +37,13 @@ extern void test_Negative(void);
 extern void test_IllegalChar(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("atouint.c");
   RUN_TEST(test_RegularPositive, 9);
   RUN_TEST(test_PositiveOverflowBoundary, 10);
diff --git a/tests/libntp/run-authkeys.c b/tests/libntp/run-authkeys.c
index cc91876a8..b2665e415 100644
--- a/tests/libntp/run-authkeys.c
+++ b/tests/libntp/run-authkeys.c
@@ -40,6 +40,13 @@ extern void test_EmptyKey(void);
 extern void test_auth_log2(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -55,6 +62,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("authkeys.c");
   RUN_TEST(test_AddTrustedKeys, 25);
   RUN_TEST(test_AddUntrustedKey, 26);
diff --git a/tests/libntp/run-buftvtots.c b/tests/libntp/run-buftvtots.c
index 82a19698e..c8d68a368 100644
--- a/tests/libntp/run-buftvtots.c
+++ b/tests/libntp/run-buftvtots.c
@@ -38,6 +38,13 @@ extern void test_IllegalMicroseconds(void);
 extern void test_AlwaysFalseOnWindows(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -53,6 +60,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("buftvtots.c");
   RUN_TEST(test_ZeroBuffer, 14);
   RUN_TEST(test_IntegerAndFractionalBuffer, 15);
diff --git a/tests/libntp/run-calendar.c b/tests/libntp/run-calendar.c
index 82309bd3b..393b36898 100644
--- a/tests/libntp/run-calendar.c
+++ b/tests/libntp/run-calendar.c
@@ -50,6 +50,13 @@ extern void test_NtpToNtp(void);
 extern void test_NtpToTime(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -65,6 +72,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("calendar.c");
   RUN_TEST(test_DaySplitMerge, 24);
   RUN_TEST(test_SplitYearDays1, 25);
diff --git a/tests/libntp/run-caljulian.c b/tests/libntp/run-caljulian.c
index a11389cbd..f611dde28 100644
--- a/tests/libntp/run-caljulian.c
+++ b/tests/libntp/run-caljulian.c
@@ -37,6 +37,13 @@ extern void test_uLongBoundary(void);
 extern void test_uLongWrapped(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("caljulian.c");
   RUN_TEST(test_RegularTime, 16);
   RUN_TEST(test_LeapYear, 17);
diff --git a/tests/libntp/run-caltontp.c b/tests/libntp/run-caltontp.c
index c80e0a4a7..b6d043f67 100644
--- a/tests/libntp/run-caltontp.c
+++ b/tests/libntp/run-caltontp.c
@@ -34,6 +34,13 @@ extern void test_DateLeapYear(void);
 extern void test_WraparoundDateIn2036(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("caltontp.c");
   RUN_TEST(test_DateGivenMonthDay, 5);
   RUN_TEST(test_DateGivenYearDay, 6);
diff --git a/tests/libntp/run-calyearstart.c b/tests/libntp/run-calyearstart.c
index 374e9d5eb..68909169a 100644
--- a/tests/libntp/run-calyearstart.c
+++ b/tests/libntp/run-calyearstart.c
@@ -35,6 +35,13 @@ extern void test_NoWrapInDateRangeLeapYear(void);
 extern void test_WrapInDateRange(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -50,6 +57,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("calyearstart.c");
   RUN_TEST(test_NoWrapInDateRange, 11);
   RUN_TEST(test_NoWrapInDateRangeLeapYear, 12);
diff --git a/tests/libntp/run-clocktime.c b/tests/libntp/run-clocktime.c
index 8d19831f6..a729cb487 100644
--- a/tests/libntp/run-clocktime.c
+++ b/tests/libntp/run-clocktime.c
@@ -40,6 +40,13 @@ extern void test_NoReasonableConversion(void);
 extern void test_AlwaysInLimit(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -55,6 +62,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("clocktime.c");
   RUN_TEST(test_CurrentYear, 11);
   RUN_TEST(test_CurrentYearFuzz, 12);
diff --git a/tests/libntp/run-decodenetnum.c b/tests/libntp/run-decodenetnum.c
index d41f93eb4..aef1fdaa2 100644
--- a/tests/libntp/run-decodenetnum.c
+++ b/tests/libntp/run-decodenetnum.c
@@ -37,6 +37,13 @@ extern void test_IllegalAddress(void);
 extern void test_IllegalCharInPort(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("decodenetnum.c");
   RUN_TEST(test_IPv4AddressOnly, 8);
   RUN_TEST(test_IPv4AddressWithPort, 9);
diff --git a/tests/libntp/run-hextoint.c b/tests/libntp/run-hextoint.c
index 66cc57dcd..70f000eb6 100644
--- a/tests/libntp/run-hextoint.c
+++ b/tests/libntp/run-hextoint.c
@@ -37,6 +37,13 @@ extern void test_Overflow(void);
 extern void test_IllegalChar(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("hextoint.c");
   RUN_TEST(test_SingleDigit, 9);
   RUN_TEST(test_MultipleDigits, 10);
diff --git a/tests/libntp/run-hextolfp.c b/tests/libntp/run-hextolfp.c
index e894c3bbe..258d9b172 100644
--- a/tests/libntp/run-hextolfp.c
+++ b/tests/libntp/run-hextolfp.c
@@ -38,6 +38,13 @@ extern void test_IllegalNumberOfInteger(void);
 extern void test_IllegalChar(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -53,6 +60,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("hextolfp.c");
   RUN_TEST(test_PositiveInteger, 9);
   RUN_TEST(test_NegativeInteger, 10);
diff --git a/tests/libntp/run-humandate.c b/tests/libntp/run-humandate.c
index 690895fdd..109292ecf 100644
--- a/tests/libntp/run-humandate.c
+++ b/tests/libntp/run-humandate.c
@@ -33,6 +33,13 @@ extern void test_RegularTime(void);
 extern void test_CurrentTime(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("humandate.c");
   RUN_TEST(test_RegularTime, 9);
   RUN_TEST(test_CurrentTime, 10);
diff --git a/tests/libntp/run-lfpfunc.c b/tests/libntp/run-lfpfunc.c
index 5c7f658fa..40d004f24 100644
--- a/tests/libntp/run-lfpfunc.c
+++ b/tests/libntp/run-lfpfunc.c
@@ -42,6 +42,13 @@ extern void test_SignedRelOps(void);
 extern void test_UnsignedRelOps(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -57,6 +64,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("lfpfunc.c");
   RUN_TEST(test_AdditionLR, 48);
   RUN_TEST(test_AdditionRL, 49);
diff --git a/tests/libntp/run-lfptostr.c b/tests/libntp/run-lfptostr.c
index fbdeb7a1d..2ee7b0055 100644
--- a/tests/libntp/run-lfptostr.c
+++ b/tests/libntp/run-lfptostr.c
@@ -42,6 +42,13 @@ extern void test_MillisecondsRoundingDown(void);
 extern void test_UnsignedInteger(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -57,6 +64,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("lfptostr.c");
   RUN_TEST(test_PositiveInteger, 24);
   RUN_TEST(test_NegativeInteger, 25);
diff --git a/tests/libntp/run-modetoa.c b/tests/libntp/run-modetoa.c
index 0c1558e6d..6d561340d 100644
--- a/tests/libntp/run-modetoa.c
+++ b/tests/libntp/run-modetoa.c
@@ -32,6 +32,13 @@ extern void test_KnownMode(void);
 extern void test_UnknownMode(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -47,6 +54,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("modetoa.c");
   RUN_TEST(test_KnownMode, 8);
   RUN_TEST(test_UnknownMode, 9);
diff --git a/tests/libntp/run-msyslog.c b/tests/libntp/run-msyslog.c
index ff264f833..0ebeb4562 100644
--- a/tests/libntp/run-msyslog.c
+++ b/tests/libntp/run-msyslog.c
@@ -38,6 +38,13 @@ extern void test_msnprintfNullTarget(void);
 extern void test_msnprintfTruncate(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -53,6 +60,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("msyslog.c");
   RUN_TEST(test_msnprintf, 14);
   RUN_TEST(test_msnprintfLiteralPercentm, 15);
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index 9301b84b3..c41630bc7 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -36,6 +36,13 @@ extern void test_ClassAAddress(void);
 extern void test_IPv6Address(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -51,6 +58,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("netof.c");
   RUN_TEST(test_ClassBAddress, 12);
   RUN_TEST(test_ClassCAddress, 13);
diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c
index f3368a721..8b0ab7971 100644
--- a/tests/libntp/run-numtoa.c
+++ b/tests/libntp/run-numtoa.c
@@ -33,6 +33,13 @@ extern void test_Address(void);
 extern void test_Netmask(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("numtoa.c");
   RUN_TEST(test_Address, 9);
   RUN_TEST(test_Netmask, 10);
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
index 49b52640b..4e49ccb02 100644
--- a/tests/libntp/run-numtohost.c
+++ b/tests/libntp/run-numtohost.c
@@ -32,6 +32,13 @@ extern void tearDown(void);
 extern void test_LoopbackNetNonResolve(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -47,6 +54,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("numtohost.c");
   RUN_TEST(test_LoopbackNetNonResolve, 9);
 
diff --git a/tests/libntp/run-octtoint.c b/tests/libntp/run-octtoint.c
index 9d2990401..300276365 100644
--- a/tests/libntp/run-octtoint.c
+++ b/tests/libntp/run-octtoint.c
@@ -37,6 +37,13 @@ extern void test_IllegalCharacter(void);
 extern void test_IllegalDigit(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("octtoint.c");
   RUN_TEST(test_SingleDigit, 8);
   RUN_TEST(test_MultipleDigits, 9);
diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c
index e034cc2af..e5e7e09a2 100644
--- a/tests/libntp/run-prettydate.c
+++ b/tests/libntp/run-prettydate.c
@@ -33,6 +33,13 @@ extern void tearDown(void);
 extern void test_ConstantDate(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("prettydate.c");
   RUN_TEST(test_ConstantDate, 10);
 
diff --git a/tests/libntp/run-recvbuff.c b/tests/libntp/run-recvbuff.c
index b8a379663..926a5a946 100644
--- a/tests/libntp/run-recvbuff.c
+++ b/tests/libntp/run-recvbuff.c
@@ -33,6 +33,13 @@ extern void test_GetAndFree(void);
 extern void test_GetAndFill(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("recvbuff.c");
   RUN_TEST(test_Initialization, 8);
   RUN_TEST(test_GetAndFree, 9);
diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 465690f76..1c9e1dc7f 100644
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -34,6 +34,13 @@ extern void tearDown(void);
 extern void test_refidsmear(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("refidsmear.c");
   RUN_TEST(test_refidsmear, 36);
 
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index d829580b0..5383d3aad 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -33,6 +33,13 @@ extern void test_LocalClock(void);
 extern void test_UnknownId(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -48,6 +55,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("refnumtoa.c");
   RUN_TEST(test_LocalClock, 13);
   RUN_TEST(test_UnknownId, 14);
diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index 1dba912d5..53eba8d6b 100644
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -39,6 +39,13 @@ extern void test_SingleDecimalInteger(void);
 extern void test_SingleDecimalRounding(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -54,6 +61,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("sfptostr.c");
   RUN_TEST(test_PositiveInteger, 13);
   RUN_TEST(test_NegativeInteger, 14);
diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c
index bde07ed60..b409f20c9 100644
--- a/tests/libntp/run-socktoa.c
+++ b/tests/libntp/run-socktoa.c
@@ -38,6 +38,13 @@ extern void test_HashEqual(void);
 extern void test_HashNotEqual(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -53,6 +60,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("socktoa.c");
   RUN_TEST(test_IPv4AddressWithPort, 11);
   RUN_TEST(test_IPv6AddressWithPort, 12);
diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index cef9a36fb..fcb4a9d19 100644
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -31,10 +31,19 @@ extern void tearDown(void);
 extern void test_MD5KeyTypeWithoutDigestLength(void);
 extern void test_MD5KeyTypeWithDigestLength(void);
 extern void test_SHA1KeyTypeWithDigestLength(void);
+extern void test_CMACKeyTypeWithDigestLength(void);
 extern void test_MD5KeyName(void);
 extern void test_SHA1KeyName(void);
+extern void test_CMACKeyName(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -50,12 +59,15 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("ssl_init.c");
-  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 17);
-  RUN_TEST(test_MD5KeyTypeWithDigestLength, 18);
-  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 19);
-  RUN_TEST(test_MD5KeyName, 20);
-  RUN_TEST(test_SHA1KeyName, 21);
+  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 20);
+  RUN_TEST(test_MD5KeyTypeWithDigestLength, 21);
+  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 22);
+  RUN_TEST(test_CMACKeyTypeWithDigestLength, 23);
+  RUN_TEST(test_MD5KeyName, 24);
+  RUN_TEST(test_SHA1KeyName, 25);
+  RUN_TEST(test_CMACKeyName, 26);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c
index f0f93861e..b1902e1e4 100644
--- a/tests/libntp/run-statestr.c
+++ b/tests/libntp/run-statestr.c
@@ -36,6 +36,13 @@ extern void test_ClockCodeExists(void);
 extern void test_ClockCodeUnknown(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -51,6 +58,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("statestr.c");
   RUN_TEST(test_PeerRestart, 10);
   RUN_TEST(test_SysUnspecified, 11);
diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c
index 404f57f11..07f27c277 100644
--- a/tests/libntp/run-strtolfp.c
+++ b/tests/libntp/run-strtolfp.c
@@ -39,6 +39,13 @@ extern void test_NegativeMsFraction(void);
 extern void test_InvalidChars(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -54,6 +61,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("strtolfp.c");
   RUN_TEST(test_PositiveInteger, 12);
   RUN_TEST(test_NegativeInteger, 13);
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index badc84a9b..76bad9415 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -62,6 +62,13 @@ extern void test_LFProundtrip(void);
 extern void test_ToString(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -77,6 +84,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("timespecops.c");
   RUN_TEST(test_Helpers1, 37);
   RUN_TEST(test_Normalise, 38);
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index 69fead53c..cadfa6c5a 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -61,6 +61,13 @@ extern void test_LFProundtrip(void);
 extern void test_ToString(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -76,6 +83,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("timevalops.c");
   RUN_TEST(test_Helpers1, 37);
   RUN_TEST(test_Normalise, 38);
diff --git a/tests/libntp/run-tsafememcmp.c b/tests/libntp/run-tsafememcmp.c
index 1bcfc9cda..7f40e2bea 100644
--- a/tests/libntp/run-tsafememcmp.c
+++ b/tests/libntp/run-tsafememcmp.c
@@ -37,6 +37,13 @@ extern void test_MiddleByte(void);
 extern void test_MiddleByteUpLo(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -52,6 +59,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("tsafememcmp.c");
   RUN_TEST(test_Empty, 10);
   RUN_TEST(test_Equal, 11);
diff --git a/tests/libntp/run-tstotv.c b/tests/libntp/run-tstotv.c
index c060f7712..17f879e4d 100644
--- a/tests/libntp/run-tstotv.c
+++ b/tests/libntp/run-tstotv.c
@@ -34,6 +34,13 @@ extern void test_MicrosecondsExact(void);
 extern void test_MicrosecondsRounding(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("tstotv.c");
   RUN_TEST(test_Seconds, 8);
   RUN_TEST(test_MicrosecondsExact, 9);
diff --git a/tests/libntp/run-tvtots.c b/tests/libntp/run-tvtots.c
index 3ed734eca..c31768885 100644
--- a/tests/libntp/run-tvtots.c
+++ b/tests/libntp/run-tvtots.c
@@ -35,6 +35,13 @@ extern void test_MicrosecondsRounded(void);
 extern void test_MicrosecondsExact(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -50,6 +57,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("tvtots.c");
   RUN_TEST(test_Seconds, 10);
   RUN_TEST(test_MicrosecondsRounded, 11);
diff --git a/tests/libntp/run-uglydate.c b/tests/libntp/run-uglydate.c
index 5667b7062..5cc04bda6 100644
--- a/tests/libntp/run-uglydate.c
+++ b/tests/libntp/run-uglydate.c
@@ -32,6 +32,13 @@ extern void tearDown(void);
 extern void test_ConstantDateTime(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -47,6 +54,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("uglydate.c");
   RUN_TEST(test_ConstantDateTime, 9);
 
diff --git a/tests/libntp/run-vi64ops.c b/tests/libntp/run-vi64ops.c
index 599a4b78d..b5cafc7f6 100644
--- a/tests/libntp/run-vi64ops.c
+++ b/tests/libntp/run-vi64ops.c
@@ -34,6 +34,13 @@ extern void test_ParseVUI64_neg(void);
 extern void test_ParseVUI64_case(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("vi64ops.c");
   RUN_TEST(test_ParseVUI64_pos, 10);
   RUN_TEST(test_ParseVUI64_neg, 11);
diff --git a/tests/libntp/run-ymd2yd.c b/tests/libntp/run-ymd2yd.c
index 4669ce9b5..3200632a8 100644
--- a/tests/libntp/run-ymd2yd.c
+++ b/tests/libntp/run-ymd2yd.c
@@ -34,6 +34,13 @@ extern void test_LeapYearFebruary(void);
 extern void test_LeapYearDecember(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("ymd2yd.c");
   RUN_TEST(test_NonLeapYearFebruary, 7);
   RUN_TEST(test_NonLeapYearJune, 8);
diff --git a/tests/libntp/testconf.yml b/tests/libntp/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/libntp/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am
index c6581e755..caa4357a1 100644
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@ -4,9 +4,10 @@ CLEANFILES =
 
 std_unity_list =						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS =		\
 	test-leapsec		\
diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c
index 03b633e1e..10c8c5f78 100644
--- a/tests/ntpd/run-leapsec.c
+++ b/tests/ntpd/run-leapsec.c
@@ -68,6 +68,13 @@ extern void test_lsEmptyTableDumb(void);
 extern void test_lsEmptyTableElectric(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -83,6 +90,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("leapsec.c");
   RUN_TEST(test_ValidateGood, 351);
   RUN_TEST(test_ValidateNoHash, 362);
diff --git a/tests/ntpd/run-ntp_prio_q.c b/tests/ntpd/run-ntp_prio_q.c
index 35af443de..82bec261c 100644
--- a/tests/ntpd/run-ntp_prio_q.c
+++ b/tests/ntpd/run-ntp_prio_q.c
@@ -41,6 +41,13 @@ extern void test_DestroyNonEmptyQueue(void);
 extern void test_AppendQueues(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -56,6 +63,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("ntp_prio_q.c");
   RUN_TEST(test_AllocateDeallocateNode, 39);
   RUN_TEST(test_EmptyQueue, 46);
diff --git a/tests/ntpd/run-ntp_restrict.c b/tests/ntpd/run-ntp_restrict.c
index d88446207..9cf14533a 100644
--- a/tests/ntpd/run-ntp_restrict.c
+++ b/tests/ntpd/run-ntp_restrict.c
@@ -39,6 +39,13 @@ extern void test_DeletedRestrictionIsNotMatched(void);
 extern void test_RestrictUnflagWorks(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -54,6 +61,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("ntp_restrict.c");
   RUN_TEST(test_RestrictionsAreEmptyAfterInit, 60);
   RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 86);
diff --git a/tests/ntpd/run-rc_cmdlength.c b/tests/ntpd/run-rc_cmdlength.c
index 927a45e73..684470ce9 100644
--- a/tests/ntpd/run-rc_cmdlength.c
+++ b/tests/ntpd/run-rc_cmdlength.c
@@ -36,6 +36,13 @@ extern void tearDown(void);
 extern void test_EvaluateCommandLength(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -51,6 +58,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("rc_cmdlength.c");
   RUN_TEST(test_EvaluateCommandLength, 16);
 
diff --git a/tests/ntpd/run-t-ntp_scanner.c b/tests/ntpd/run-t-ntp_scanner.c
index 62d3ed308..9bed5cfb9 100644
--- a/tests/ntpd/run-t-ntp_scanner.c
+++ b/tests/ntpd/run-t-ntp_scanner.c
@@ -40,6 +40,13 @@ extern void test_SpecialSymbols(void);
 extern void test_EOC(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -55,6 +62,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("t-ntp_scanner.c");
   RUN_TEST(test_keywordIncorrectToken, 21);
   RUN_TEST(test_keywordServerToken, 22);
diff --git a/tests/ntpd/run-t-ntp_signd.c b/tests/ntpd/run-t-ntp_signd.c
index 5226f7f85..644b6cee8 100644
--- a/tests/ntpd/run-t-ntp_signd.c
+++ b/tests/ntpd/run-t-ntp_signd.c
@@ -39,6 +39,13 @@ extern void test_recv_packet(void);
 extern void test_send_via_ntp_signd(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -54,6 +61,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("t-ntp_signd.c");
   RUN_TEST(test_connect_incorrect_socket, 67);
   RUN_TEST(test_connect_correct_socket, 68);
diff --git a/tests/ntpd/testconf.yml b/tests/ntpd/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/ntpd/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am
index 9cd2de94e..361372323 100644
--- a/tests/ntpq/Makefile.am
+++ b/tests/ntpq/Makefile.am
@@ -4,9 +4,10 @@ CLEANFILES =
 
 std_unity_list = 						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS = 	\
 	test-ntpq	\
diff --git a/tests/ntpq/run-t-ntpq.c b/tests/ntpq/run-t-ntpq.c
index ccf2a06c8..baa1211c4 100644
--- a/tests/ntpq/run-t-ntpq.c
+++ b/tests/ntpq/run-t-ntpq.c
@@ -32,6 +32,13 @@ extern void tearDown(void);
 extern void testPrimary(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -47,6 +54,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("t-ntpq.c");
   RUN_TEST(testPrimary, 20);
 
diff --git a/tests/ntpq/testconf.yml b/tests/ntpq/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/ntpq/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/sandbox/Makefile.am b/tests/sandbox/Makefile.am
index 38df52ba1..60615a5fd 100644
--- a/tests/sandbox/Makefile.am
+++ b/tests/sandbox/Makefile.am
@@ -6,9 +6,10 @@ CLEANFILES =
 
 std_unity_list = 						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS =	\
 	first-test	\
diff --git a/tests/sandbox/run-modetoa.c b/tests/sandbox/run-modetoa.c
index 143bd756c..000df89ea 100644
--- a/tests/sandbox/run-modetoa.c
+++ b/tests/sandbox/run-modetoa.c
@@ -30,6 +30,13 @@ extern void test_KnownMode(void);
 extern void test_UnknownMode(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -45,6 +52,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("modetoa.c");
   RUN_TEST(test_KnownMode, 8);
   RUN_TEST(test_UnknownMode, 15);
diff --git a/tests/sandbox/run-uglydate.c b/tests/sandbox/run-uglydate.c
index 5a5a7161d..151a3cd27 100644
--- a/tests/sandbox/run-uglydate.c
+++ b/tests/sandbox/run-uglydate.c
@@ -32,6 +32,13 @@ extern void tearDown(void);
 extern void test_ConstantDateTime(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -47,6 +54,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("uglydate.c");
   RUN_TEST(test_ConstantDateTime, 10);
 
diff --git a/tests/sandbox/run-ut-2803.c b/tests/sandbox/run-ut-2803.c
index b948c4a38..afe09049a 100644
--- a/tests/sandbox/run-ut-2803.c
+++ b/tests/sandbox/run-ut-2803.c
@@ -34,6 +34,13 @@ extern void test_main_incorrect(void);
 extern void test_ignored(void);
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -49,6 +56,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("ut-2803.c");
   RUN_TEST(test_main, 30);
   RUN_TEST(test_XPASS, 37);
diff --git a/tests/sandbox/testconf.yml b/tests/sandbox/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/sandbox/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+
diff --git a/tests/sec-2853/Makefile.am b/tests/sec-2853/Makefile.am
index 3f44201a1..5fcc57527 100644
--- a/tests/sec-2853/Makefile.am
+++ b/tests/sec-2853/Makefile.am
@@ -5,16 +5,18 @@ CLEANFILES =
 
 std_unity_list = 						\
 	$(top_srcdir)/sntp/unity/auto/generate_test_runner.rb	\
+	$(srcdir)/testconf.yml					\
 	$(NULL)
 
-run_unity =	cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
+run_unity =	cd $(srcdir) && ruby $(std_unity_list)
 
 check_PROGRAMS = sec-2853
 
 # HMS: we may not need some of these:
 LDADD =					\
-	$(top_builddir)/sntp/unity/libunity.a	\
 	$(top_builddir)/ntpd/rc_cmdlength.o	\
+	$(top_builddir)/sntp/unity/libunity.a	\
+	$(top_builddir)/libntp/libntp.a	\
 	$(LDADD_LIBNTP)			\
 	$(PTHREAD_LIBS)			\
 	$(LDADD_NTP)			\
diff --git a/tests/sec-2853/run-sec-2853.c b/tests/sec-2853/run-sec-2853.c
index 1159a77c1..d3a0c60c2 100644
--- a/tests/sec-2853/run-sec-2853.c
+++ b/tests/sec-2853/run-sec-2853.c
@@ -31,6 +31,13 @@ extern void tearDown(void);
 extern void test_main(void );
 
 
+//=======Suite Setup=====
+static void suite_setup(void)
+{
+extern int change_logfile(const char*, int);
+change_logfile("stderr", 0);
+}
+
 //=======Test Reset Option=====
 void resetTest(void);
 void resetTest(void)
@@ -46,6 +53,7 @@ char const *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  suite_setup();
   UnityBegin("sec-2853.c");
   RUN_TEST(test_main, 10);
 
diff --git a/tests/sec-2853/testconf.yml b/tests/sec-2853/testconf.yml
new file mode 100644
index 000000000..6140daaf9
--- /dev/null
+++ b/tests/sec-2853/testconf.yml
@@ -0,0 +1,9 @@
+# configure the test runner generator to properly set up the tests
+# - avoid cluttering the syslogs
+
+--- 
+:unity:
+  :suite_setup:
+    - extern int change_logfile(const char*, int);
+    - change_logfile("stderr", 0);
+