Merge branch 'stable/10' into devel

1 files changed, 9 insertions, 5 deletions

diff --git a/contrib/ntp/tests/libntp/run-tvtots.c b/contrib/ntp/tests/libntp/run-tvtots.c
index 468aae5..3ed734e 100644
--- a/contrib/ntp/tests/libntp/run-tvtots.c
+++ b/contrib/ntp/tests/libntp/run-tvtots.c
@@ -22,6 +22,10 @@
 #include "unity.h"
 #include <setjmp.h>
 #include <stdio.h>
+#include "config.h"
+#include "lfptest.h"
+#include "timevalops.h"
+#include <math.h>
 
 //=======External Functions This Runner Calls=====
 extern void setUp(void);
@@ -32,24 +36,24 @@ extern void test_MicrosecondsExact(void);
 
 
 //=======Test Reset Option=====
-void resetTest()
+void resetTest(void);
+void resetTest(void)
 {
   tearDown();
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
 int main(int argc, char *argv[])
 {
   progname = argv[0];
-  Unity.TestFile = "tvtots.c";
   UnityBegin("tvtots.c");
   RUN_TEST(test_Seconds, 10);
-  RUN_TEST(test_MicrosecondsRounded, 21);
-  RUN_TEST(test_MicrosecondsExact, 36);
+  RUN_TEST(test_MicrosecondsRounded, 11);
+  RUN_TEST(test_MicrosecondsExact, 12);
 
   return (UnityEnd());
 }