merge cleanup

bk: 566031df3Ch8n5R5gKIs_MafCGxqtQ

diff --git a/ChangeLog b/ChangeLog
index e1a58673e224a5b9832eee93de967c1962a1f47f..37d7c4f2c876608eccbdd3a8ddd46e1ec259b608 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Below are from 4.2.8p5:
+* CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c.  HStenn.
+* CID 1341533: Missing assertion in sntp/tests/t-log.c.  HStenn.
+* CID 1341534: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341535: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341536: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341537: Resource leak in tests/ntpd/t-ntp_signd.c.  HStenn.
+* CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262.  HStenn.
+* Header cleanup in tests/sandbox/uglydate.c.  Harlan Stenn.
+* Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
 (4.3.85) 2015/12/02 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)

diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index bae4e5f488151d7d4abd773920491427eb5f7b4e..1dba912d5c1fa6f8851bab19cd2ccc8c2c071b74 100644 (file)
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include "config.h"
 #include "ntp_fp.h"
+#include "ntp_stdlib.h"
 
 //=======External Functions This Runner Calls=====
 extern void setUp(void);
@@ -54,14 +55,14 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("sfptostr.c");
-  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);
+  RUN_TEST(test_PositiveInteger, 13);
+  RUN_TEST(test_NegativeInteger, 14);
+  RUN_TEST(test_PositiveIntegerPositiveFraction, 15);
+  RUN_TEST(test_NegativeIntegerNegativeFraction, 16);
+  RUN_TEST(test_PositiveIntegerNegativeFraction, 17);
+  RUN_TEST(test_NegativeIntegerPositiveFraction, 18);
+  RUN_TEST(test_SingleDecimalInteger, 19);
+  RUN_TEST(test_SingleDecimalRounding, 20);
 
   return (UnityEnd());
 }

diff --git a/tests/sandbox/run-uglydate.c b/tests/sandbox/run-uglydate.c
index e65cd01097ad32903efaef0c91617b432a43c66e..5a5a7161d851d586b2bc641f4efadea4b2972326 100644 (file)
--- a/tests/sandbox/run-uglydate.c
+++ b/tests/sandbox/run-uglydate.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include "config.h"
 #include "ntp_fp.h"
+#include "ntp_stdlib.h"
 
 //=======External Functions This Runner Calls=====
 extern void setUp(void);
@@ -47,7 +48,7 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("uglydate.c");
-  RUN_TEST(test_ConstantDateTime, 9);
+  RUN_TEST(test_ConstantDateTime, 10);
 
   return (UnityEnd());
 }