From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 28 Apr 2019 07:50:11 +0000 (+0200)
Subject: [Bug 3585] Unity tests mix buffered and unbuffered output
X-Git-Tag: NTP_4_2_8P13~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22885a29ae79db1e77cead2a1b29dbcd013c5f2;p=thirdparty%2Fntp.git

[Bug 3585] Unity tests mix buffered and unbuffered output

bk: 5cc55b33u0RwmZz1Yq6FzrKzYRcSKw
---

diff --git a/ChangeLog b/ChangeLog
index 9ff845c81..6961918ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3585] Unity tests mix buffered and unbuffered output <perlinger@ntp.org>
+  - stdout+stderr are set to line buffered during test setup now
+
 ---
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/include/ntp_syslog.h b/include/ntp_syslog.h
index ecc634679..76c638682 100644
--- a/include/ntp_syslog.h
+++ b/include/ntp_syslog.h
@@ -83,4 +83,7 @@ do {								\
 		msyslog msl_args;				\
 } while (FALSE)
 
+extern int change_iobufs(int how);
+/* how: 0->unbuffered, 1->linebuffer, 2->full */
+
 #endif /* NTP_SYSLOG_H */
diff --git a/libntp/msyslog.c b/libntp/msyslog.c
index 9682d3002..9a18c4d0d 100644
--- a/libntp/msyslog.c
+++ b/libntp/msyslog.c
@@ -582,3 +582,41 @@ setup_logfile(
 		msyslog(LOG_ERR, "Cannot reopen log file %s, %m",
 			syslog_fname);
 }
+
+/* Helper for unit tests, where stdout + stderr are piped to the same
+ * stream.  This works moderately reliable only if both streams are
+ * unbuffered or line buffered.  Unfortunately stdout can be fully
+ * buffered on pipes or files...
+ */
+int
+change_iobufs(
+	int how
+	)
+{
+	int	retv = 0;
+	
+#   ifdef HAVE_SETVBUF
+
+	int mode;
+
+	switch (how) {
+	case 0 : mode = _IONBF; break; /* no buffering   */
+	case 1 : mode = _IOLBF; break; /* line buffering */
+	case 2 : mode = _IOFBF; break; /* full buffering */
+	default: mode = _IOLBF; break; /* line buffering */
+	}
+	
+	retv = 1;
+	if (setvbuf(stdout, NULL, mode, BUFSIZ) != 0)
+		retv = -1;
+	if (setvbuf(stderr, NULL, mode, BUFSIZ) != 0)
+		retv = -1;
+
+#   else
+	
+	UNUSED_ARG(how);
+	
+#   endif
+	
+	return retv;
+}
diff --git a/sntp/tests/run-crypto.c b/sntp/tests/run-crypto.c
index 0d4e94d55..a486f86c4 100644
--- a/sntp/tests/run-crypto.c
+++ b/sntp/tests/run-crypto.c
@@ -43,7 +43,9 @@ extern void test_PacketSizeNotMultipleOfFourBytes(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-keyFile.c b/sntp/tests/run-keyFile.c
index 6c1848e66..5b25519ce 100644
--- a/sntp/tests/run-keyFile.c
+++ b/sntp/tests/run-keyFile.c
@@ -41,7 +41,9 @@ extern void test_ReadKeyFileWithInvalidHex(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-kodDatabase.c b/sntp/tests/run-kodDatabase.c
index 0d86ee30f..67b7fc2c4 100644
--- a/sntp/tests/run-kodDatabase.c
+++ b/sntp/tests/run-kodDatabase.c
@@ -44,7 +44,9 @@ extern void test_DeleteEntry(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-kodFile.c b/sntp/tests/run-kodFile.c
index 07a32d724..a3af21855 100644
--- a/sntp/tests/run-kodFile.c
+++ b/sntp/tests/run-kodFile.c
@@ -42,7 +42,9 @@ extern void test_WriteFileWithMultipleEntries(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-networking.c b/sntp/tests/run-networking.c
index 0083ec392..1c1364fd6 100644
--- a/sntp/tests/run-networking.c
+++ b/sntp/tests/run-networking.c
@@ -34,7 +34,9 @@ extern void tearDown(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c
index 4cca13b53..7790b2088 100644
--- a/sntp/tests/run-packetHandling.c
+++ b/sntp/tests/run-packetHandling.c
@@ -50,7 +50,9 @@ extern void test_HandleCorrectPacket(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c
index 50144ed36..c91a6d340 100644
--- a/sntp/tests/run-packetProcessing.c
+++ b/sntp/tests/run-packetProcessing.c
@@ -54,7 +54,9 @@ extern void test_CorrectAuthenticatedPacketCMAC(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c
index 3532c4e0e..268bf41d3 100644
--- a/sntp/tests/run-t-log.c
+++ b/sntp/tests/run-t-log.c
@@ -36,7 +36,9 @@ extern void testWriteInCustomLogfile(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/run-utilities.c b/sntp/tests/run-utilities.c
index 0f3884517..f717882a4 100644
--- a/sntp/tests/run-utilities.c
+++ b/sntp/tests/run-utilities.c
@@ -44,7 +44,9 @@ extern void test_LfpOutputDecimalFormat(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/sntp/tests/testconf.yml b/sntp/tests/testconf.yml
index 6140daaf9..182e0d762 100644
--- a/sntp/tests/testconf.yml
+++ b/sntp/tests/testconf.yml
@@ -4,6 +4,8 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
 
diff --git a/tests/bug-2803/run-bug-2803.c b/tests/bug-2803/run-bug-2803.c
index b25e36253..0cc2e5f68 100644
--- a/tests/bug-2803/run-bug-2803.c
+++ b/tests/bug-2803/run-bug-2803.c
@@ -37,7 +37,9 @@ extern void test_main(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/bug-2803/testconf.yml b/tests/bug-2803/testconf.yml
index 6140daaf9..e9e1facbd 100644
--- a/tests/bug-2803/testconf.yml
+++ b/tests/bug-2803/testconf.yml
@@ -4,6 +4,7 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
-
diff --git a/tests/bug-3102/testconf.yml b/tests/bug-3102/testconf.yml
index 6140daaf9..182e0d762 100644
--- a/tests/bug-3102/testconf.yml
+++ b/tests/bug-3102/testconf.yml
@@ -4,6 +4,8 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
 
diff --git a/tests/libntp/run-a_md5encrypt.c b/tests/libntp/run-a_md5encrypt.c
index 332f0e2d1..2d9c08669 100644
--- a/tests/libntp/run-a_md5encrypt.c
+++ b/tests/libntp/run-a_md5encrypt.c
@@ -39,7 +39,9 @@ extern void test_IPv6AddressToRefId(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-atoint.c b/tests/libntp/run-atoint.c
index 9212c81cb..a89530920 100644
--- a/tests/libntp/run-atoint.c
+++ b/tests/libntp/run-atoint.c
@@ -40,7 +40,9 @@ extern void test_IllegalCharacter(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-atouint.c b/tests/libntp/run-atouint.c
index 9597a7658..afcb590ca 100644
--- a/tests/libntp/run-atouint.c
+++ b/tests/libntp/run-atouint.c
@@ -40,7 +40,9 @@ extern void test_IllegalChar(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-authkeys.c b/tests/libntp/run-authkeys.c
index bdf48f0e1..b56be93fc 100644
--- a/tests/libntp/run-authkeys.c
+++ b/tests/libntp/run-authkeys.c
@@ -49,7 +49,9 @@ extern void test_AddrMatch_ipv6(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-buftvtots.c b/tests/libntp/run-buftvtots.c
index c8d68a368..73afe87ca 100644
--- a/tests/libntp/run-buftvtots.c
+++ b/tests/libntp/run-buftvtots.c
@@ -41,7 +41,9 @@ extern void test_AlwaysFalseOnWindows(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-calendar.c b/tests/libntp/run-calendar.c
index 393b36898..d7b642019 100644
--- a/tests/libntp/run-calendar.c
+++ b/tests/libntp/run-calendar.c
@@ -53,7 +53,9 @@ extern void test_NtpToTime(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-caljulian.c b/tests/libntp/run-caljulian.c
index f611dde28..51d5470c1 100644
--- a/tests/libntp/run-caljulian.c
+++ b/tests/libntp/run-caljulian.c
@@ -40,7 +40,9 @@ extern void test_uLongWrapped(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-caltontp.c b/tests/libntp/run-caltontp.c
index b6d043f67..9c54d9a81 100644
--- a/tests/libntp/run-caltontp.c
+++ b/tests/libntp/run-caltontp.c
@@ -37,7 +37,9 @@ extern void test_WraparoundDateIn2036(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-calyearstart.c b/tests/libntp/run-calyearstart.c
index 68909169a..1f3212ef0 100644
--- a/tests/libntp/run-calyearstart.c
+++ b/tests/libntp/run-calyearstart.c
@@ -38,7 +38,9 @@ extern void test_WrapInDateRange(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-clocktime.c b/tests/libntp/run-clocktime.c
index a729cb487..96d32e143 100644
--- a/tests/libntp/run-clocktime.c
+++ b/tests/libntp/run-clocktime.c
@@ -43,7 +43,9 @@ extern void test_AlwaysInLimit(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-decodenetnum.c b/tests/libntp/run-decodenetnum.c
index aef1fdaa2..ef2b3c68e 100644
--- a/tests/libntp/run-decodenetnum.c
+++ b/tests/libntp/run-decodenetnum.c
@@ -40,7 +40,9 @@ extern void test_IllegalCharInPort(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-hextoint.c b/tests/libntp/run-hextoint.c
index 70f000eb6..fb383121a 100644
--- a/tests/libntp/run-hextoint.c
+++ b/tests/libntp/run-hextoint.c
@@ -40,7 +40,9 @@ extern void test_IllegalChar(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-hextolfp.c b/tests/libntp/run-hextolfp.c
index 258d9b172..85ba58ad6 100644
--- a/tests/libntp/run-hextolfp.c
+++ b/tests/libntp/run-hextolfp.c
@@ -41,7 +41,9 @@ extern void test_IllegalChar(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-humandate.c b/tests/libntp/run-humandate.c
index 109292ecf..04ea37f83 100644
--- a/tests/libntp/run-humandate.c
+++ b/tests/libntp/run-humandate.c
@@ -36,7 +36,9 @@ extern void test_CurrentTime(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-lfpfunc.c b/tests/libntp/run-lfpfunc.c
index 40d004f24..851ea3e4f 100644
--- a/tests/libntp/run-lfpfunc.c
+++ b/tests/libntp/run-lfpfunc.c
@@ -45,7 +45,9 @@ extern void test_UnsignedRelOps(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-lfptostr.c b/tests/libntp/run-lfptostr.c
index 2ee7b0055..b5336fd2a 100644
--- a/tests/libntp/run-lfptostr.c
+++ b/tests/libntp/run-lfptostr.c
@@ -45,7 +45,9 @@ extern void test_UnsignedInteger(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-modetoa.c b/tests/libntp/run-modetoa.c
index 6d561340d..97b983f2d 100644
--- a/tests/libntp/run-modetoa.c
+++ b/tests/libntp/run-modetoa.c
@@ -35,7 +35,9 @@ extern void test_UnknownMode(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-msyslog.c b/tests/libntp/run-msyslog.c
index 0ebeb4562..7a01e9a81 100644
--- a/tests/libntp/run-msyslog.c
+++ b/tests/libntp/run-msyslog.c
@@ -41,7 +41,9 @@ extern void test_msnprintfTruncate(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index c41630bc7..9c81f3847 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -39,7 +39,9 @@ extern void test_IPv6Address(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c
index 8b0ab7971..614e65472 100644
--- a/tests/libntp/run-numtoa.c
+++ b/tests/libntp/run-numtoa.c
@@ -36,7 +36,9 @@ extern void test_Netmask(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
index 4e49ccb02..3129845f7 100644
--- a/tests/libntp/run-numtohost.c
+++ b/tests/libntp/run-numtohost.c
@@ -35,7 +35,9 @@ extern void test_LoopbackNetNonResolve(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-octtoint.c b/tests/libntp/run-octtoint.c
index 300276365..f60cca816 100644
--- a/tests/libntp/run-octtoint.c
+++ b/tests/libntp/run-octtoint.c
@@ -40,7 +40,9 @@ extern void test_IllegalDigit(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c
index e5e7e09a2..66a656cd9 100644
--- a/tests/libntp/run-prettydate.c
+++ b/tests/libntp/run-prettydate.c
@@ -36,7 +36,9 @@ extern void test_ConstantDate(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-recvbuff.c b/tests/libntp/run-recvbuff.c
index 926a5a946..b58f62585 100644
--- a/tests/libntp/run-recvbuff.c
+++ b/tests/libntp/run-recvbuff.c
@@ -36,7 +36,9 @@ extern void test_GetAndFill(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 1c9e1dc7f..4575ae47d 100644
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -37,7 +37,9 @@ extern void test_refidsmear(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index 5383d3aad..e56c9a115 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -36,7 +36,9 @@ extern void test_UnknownId(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-sbprintf.c b/tests/libntp/run-sbprintf.c
index 996139613..b5ce0bccc 100644
--- a/tests/libntp/run-sbprintf.c
+++ b/tests/libntp/run-sbprintf.c
@@ -42,7 +42,9 @@ extern void test_Increment1(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index 53eba8d6b..9718557c8 100644
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -42,7 +42,9 @@ extern void test_SingleDecimalRounding(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c
index b409f20c9..ecca95c29 100644
--- a/tests/libntp/run-socktoa.c
+++ b/tests/libntp/run-socktoa.c
@@ -41,7 +41,9 @@ extern void test_HashNotEqual(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index fcb4a9d19..8450a27c3 100644
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -40,7 +40,9 @@ extern void test_CMACKeyName(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c
index b1902e1e4..8a97f8ef9 100644
--- a/tests/libntp/run-statestr.c
+++ b/tests/libntp/run-statestr.c
@@ -39,7 +39,9 @@ extern void test_ClockCodeUnknown(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c
index 07f27c277..603a360df 100644
--- a/tests/libntp/run-strtolfp.c
+++ b/tests/libntp/run-strtolfp.c
@@ -42,7 +42,9 @@ extern void test_InvalidChars(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index 76bad9415..ee5831fdb 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -65,7 +65,9 @@ extern void test_ToString(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index cadfa6c5a..a38bbdd6b 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -64,7 +64,9 @@ extern void test_ToString(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-tsafememcmp.c b/tests/libntp/run-tsafememcmp.c
index 7f40e2bea..a2a54eec7 100644
--- a/tests/libntp/run-tsafememcmp.c
+++ b/tests/libntp/run-tsafememcmp.c
@@ -40,7 +40,9 @@ extern void test_MiddleByteUpLo(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-tstotv.c b/tests/libntp/run-tstotv.c
index 17f879e4d..f69fda9a6 100644
--- a/tests/libntp/run-tstotv.c
+++ b/tests/libntp/run-tstotv.c
@@ -37,7 +37,9 @@ extern void test_MicrosecondsRounding(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-tvtots.c b/tests/libntp/run-tvtots.c
index c31768885..54b4e5623 100644
--- a/tests/libntp/run-tvtots.c
+++ b/tests/libntp/run-tvtots.c
@@ -38,7 +38,9 @@ extern void test_MicrosecondsExact(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-uglydate.c b/tests/libntp/run-uglydate.c
index 5cc04bda6..347764cd9 100644
--- a/tests/libntp/run-uglydate.c
+++ b/tests/libntp/run-uglydate.c
@@ -35,7 +35,9 @@ extern void test_ConstantDateTime(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-vi64ops.c b/tests/libntp/run-vi64ops.c
index b5cafc7f6..b578165fa 100644
--- a/tests/libntp/run-vi64ops.c
+++ b/tests/libntp/run-vi64ops.c
@@ -37,7 +37,9 @@ extern void test_ParseVUI64_case(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/run-ymd2yd.c b/tests/libntp/run-ymd2yd.c
index 3200632a8..a0157645d 100644
--- a/tests/libntp/run-ymd2yd.c
+++ b/tests/libntp/run-ymd2yd.c
@@ -37,7 +37,9 @@ extern void test_LeapYearDecember(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/libntp/testconf.yml b/tests/libntp/testconf.yml
index 6140daaf9..182e0d762 100644
--- a/tests/libntp/testconf.yml
+++ b/tests/libntp/testconf.yml
@@ -4,6 +4,8 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
 
diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c
index 16b4c3fda..6c9f243d6 100644
--- a/tests/ntpd/run-leapsec.c
+++ b/tests/ntpd/run-leapsec.c
@@ -72,7 +72,9 @@ extern void test_lsEmptyTableElectric(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/run-ntp_prio_q.c b/tests/ntpd/run-ntp_prio_q.c
index 5b1adea4a..0c1c9ee4d 100644
--- a/tests/ntpd/run-ntp_prio_q.c
+++ b/tests/ntpd/run-ntp_prio_q.c
@@ -44,7 +44,9 @@ extern void test_AppendQueues(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/run-ntp_restrict.c b/tests/ntpd/run-ntp_restrict.c
index 3303640f1..ee28cee84 100644
--- a/tests/ntpd/run-ntp_restrict.c
+++ b/tests/ntpd/run-ntp_restrict.c
@@ -42,7 +42,9 @@ extern void test_RestrictUnflagWorks(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/run-rc_cmdlength.c b/tests/ntpd/run-rc_cmdlength.c
index e5121cd1d..54d78100e 100644
--- a/tests/ntpd/run-rc_cmdlength.c
+++ b/tests/ntpd/run-rc_cmdlength.c
@@ -39,7 +39,9 @@ extern void test_EvaluateCommandLength(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/run-t-ntp_scanner.c b/tests/ntpd/run-t-ntp_scanner.c
index 056bb5bc6..28eccffca 100644
--- a/tests/ntpd/run-t-ntp_scanner.c
+++ b/tests/ntpd/run-t-ntp_scanner.c
@@ -43,7 +43,9 @@ extern void test_EOC(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/run-t-ntp_signd.c b/tests/ntpd/run-t-ntp_signd.c
index 644b6cee8..6dbcc8a56 100644
--- a/tests/ntpd/run-t-ntp_signd.c
+++ b/tests/ntpd/run-t-ntp_signd.c
@@ -42,7 +42,9 @@ extern void test_send_via_ntp_signd(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpd/testconf.yml b/tests/ntpd/testconf.yml
index 6140daaf9..182e0d762 100644
--- a/tests/ntpd/testconf.yml
+++ b/tests/ntpd/testconf.yml
@@ -4,6 +4,8 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
 
diff --git a/tests/ntpq/run-t-ntpq.c b/tests/ntpq/run-t-ntpq.c
index baa1211c4..54bc21a42 100644
--- a/tests/ntpq/run-t-ntpq.c
+++ b/tests/ntpq/run-t-ntpq.c
@@ -35,7 +35,9 @@ extern void testPrimary(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/ntpq/testconf.yml b/tests/ntpq/testconf.yml
index 6140daaf9..e9e1facbd 100644
--- a/tests/ntpq/testconf.yml
+++ b/tests/ntpq/testconf.yml
@@ -4,6 +4,7 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
-
diff --git a/tests/sandbox/run-modetoa.c b/tests/sandbox/run-modetoa.c
index 000df89ea..a1751e45c 100644
--- a/tests/sandbox/run-modetoa.c
+++ b/tests/sandbox/run-modetoa.c
@@ -33,7 +33,9 @@ extern void test_UnknownMode(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/sandbox/run-uglydate.c b/tests/sandbox/run-uglydate.c
index 151a3cd27..442d0993f 100644
--- a/tests/sandbox/run-uglydate.c
+++ b/tests/sandbox/run-uglydate.c
@@ -35,7 +35,9 @@ extern void test_ConstantDateTime(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/sandbox/run-ut-2803.c b/tests/sandbox/run-ut-2803.c
index afe09049a..af0d251b2 100644
--- a/tests/sandbox/run-ut-2803.c
+++ b/tests/sandbox/run-ut-2803.c
@@ -37,7 +37,9 @@ extern void test_ignored(void);
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/sandbox/testconf.yml b/tests/sandbox/testconf.yml
index 6140daaf9..e9e1facbd 100644
--- a/tests/sandbox/testconf.yml
+++ b/tests/sandbox/testconf.yml
@@ -4,6 +4,7 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
-
diff --git a/tests/sec-2853/run-sec-2853.c b/tests/sec-2853/run-sec-2853.c
index d3a0c60c2..06c594501 100644
--- a/tests/sec-2853/run-sec-2853.c
+++ b/tests/sec-2853/run-sec-2853.c
@@ -34,7 +34,9 @@ extern void test_main(void );
 //=======Suite Setup=====
 static void suite_setup(void)
 {
+extern int change_iobufs(int);
 extern int change_logfile(const char*, int);
+change_iobufs(1);
 change_logfile("stderr", 0);
 }
 
diff --git a/tests/sec-2853/testconf.yml b/tests/sec-2853/testconf.yml
index 6140daaf9..e9e1facbd 100644
--- a/tests/sec-2853/testconf.yml
+++ b/tests/sec-2853/testconf.yml
@@ -4,6 +4,7 @@
 --- 
 :unity:
   :suite_setup:
+    - extern int change_iobufs(int);
     - extern int change_logfile(const char*, int);
+    - change_iobufs(1);
     - change_logfile("stderr", 0);
-