From: Damir Tomic <viperus@ntp.org>
Date: Sat, 4 Jul 2015 10:15:31 +0000 (+0200)
Subject: ChangeLog:
X-Git-Tag: NTP_4_3_53~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=060f378f8fc789788fbe732a94ffdd63f3966d84;p=thirdparty%2Fntp.git

ChangeLog:
  added my changes
timespecops.c:
  many fixes, better printfs etc.
  minor fixes to printf, formatting, etc.
timevalops.c:
  minor fixes to printf, formatting, etc.

bk: 5597b243xXU94dl2w_QRkLzMsLJtKg
---

diff --git a/ChangeLog b/ChangeLog
index 150d438d1..4c410778f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+
+* tests/libntp/timevalops.c and timespecops.c fixd error printing
+* tests/libntp/ improvements in code and fixed error printing
 ---
 
 * [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index 1f352d27f..48a9a51fd 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -73,34 +73,34 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "timespecops.c";
   UnityBegin("timespecops.c");
-  RUN_TEST(test_Helpers1, 155);
-  RUN_TEST(test_Normalise, 175);
-  RUN_TEST(test_SignNoFrac, 189);
-  RUN_TEST(test_SignWithFrac, 201);
-  RUN_TEST(test_CmpFracEQ, 215);
-  RUN_TEST(test_CmpFracGT, 228);
-  RUN_TEST(test_CmpFracLT, 241);
-  RUN_TEST(test_AddFullNorm, 258);
-  RUN_TEST(test_AddFullOflow1, 272);
-  RUN_TEST(test_AddNsecNorm, 286);
-  RUN_TEST(test_AddNsecOflow1, 298);
-  RUN_TEST(test_SubFullNorm, 314);
-  RUN_TEST(test_SubFullOflow, 328);
-  RUN_TEST(test_SubNsecNorm, 342);
-  RUN_TEST(test_SubNsecOflow, 354);
-  RUN_TEST(test_Neg, 370);
-  RUN_TEST(test_AbsNoFrac, 387);
-  RUN_TEST(test_AbsWithFrac, 398);
-  RUN_TEST(test_Helpers2, 413);
-  RUN_TEST(test_ToLFPbittest, 445);
-  RUN_TEST(test_ToLFPrelPos, 458);
-  RUN_TEST(test_ToLFPrelNeg, 470);
-  RUN_TEST(test_ToLFPabs, 482);
-  RUN_TEST(test_FromLFPbittest, 497);
-  RUN_TEST(test_FromLFPrelPos, 516);
-  RUN_TEST(test_FromLFPrelNeg, 529);
-  RUN_TEST(test_LFProundtrip, 544);
-  RUN_TEST(test_ToString, 563);
+  RUN_TEST(test_Helpers1, 149);
+  RUN_TEST(test_Normalise, 169);
+  RUN_TEST(test_SignNoFrac, 183);
+  RUN_TEST(test_SignWithFrac, 195);
+  RUN_TEST(test_CmpFracEQ, 209);
+  RUN_TEST(test_CmpFracGT, 222);
+  RUN_TEST(test_CmpFracLT, 235);
+  RUN_TEST(test_AddFullNorm, 252);
+  RUN_TEST(test_AddFullOflow1, 266);
+  RUN_TEST(test_AddNsecNorm, 280);
+  RUN_TEST(test_AddNsecOflow1, 292);
+  RUN_TEST(test_SubFullNorm, 308);
+  RUN_TEST(test_SubFullOflow, 322);
+  RUN_TEST(test_SubNsecNorm, 336);
+  RUN_TEST(test_SubNsecOflow, 348);
+  RUN_TEST(test_Neg, 364);
+  RUN_TEST(test_AbsNoFrac, 381);
+  RUN_TEST(test_AbsWithFrac, 392);
+  RUN_TEST(test_Helpers2, 407);
+  RUN_TEST(test_ToLFPbittest, 439);
+  RUN_TEST(test_ToLFPrelPos, 452);
+  RUN_TEST(test_ToLFPrelNeg, 464);
+  RUN_TEST(test_ToLFPabs, 476);
+  RUN_TEST(test_FromLFPbittest, 491);
+  RUN_TEST(test_FromLFPrelPos, 510);
+  RUN_TEST(test_FromLFPrelNeg, 523);
+  RUN_TEST(test_LFProundtrip, 538);
+  RUN_TEST(test_ToString, 557);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index 0430d6a91..0a2616ef2 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -73,34 +73,34 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "timevalops.c";
   UnityBegin("timevalops.c");
-  RUN_TEST(test_Helpers1, 153);
-  RUN_TEST(test_Normalise, 173);
-  RUN_TEST(test_SignNoFrac, 187);
-  RUN_TEST(test_SignWithFrac, 199);
-  RUN_TEST(test_CmpFracEQ, 214);
-  RUN_TEST(test_CmpFracGT, 228);
-  RUN_TEST(test_CmpFracLT, 242);
-  RUN_TEST(test_AddFullNorm, 260);
-  RUN_TEST(test_AddFullOflow1, 274);
-  RUN_TEST(test_AddUsecNorm, 288);
-  RUN_TEST(test_AddUsecOflow1, 300);
-  RUN_TEST(test_SubFullNorm, 316);
-  RUN_TEST(test_SubFullOflow, 330);
-  RUN_TEST(test_SubUsecNorm, 344);
-  RUN_TEST(test_SubUsecOflow, 356);
-  RUN_TEST(test_Neg, 372);
-  RUN_TEST(test_AbsNoFrac, 389);
-  RUN_TEST(test_AbsWithFrac, 400);
-  RUN_TEST(test_Helpers2, 416);
-  RUN_TEST(test_ToLFPbittest, 449);
-  RUN_TEST(test_ToLFPrelPos, 464);
-  RUN_TEST(test_ToLFPrelNeg, 478);
-  RUN_TEST(test_ToLFPabs, 491);
-  RUN_TEST(test_FromLFPbittest, 509);
-  RUN_TEST(test_FromLFPrelPos, 527);
-  RUN_TEST(test_FromLFPrelNeg, 540);
-  RUN_TEST(test_LFProundtrip, 554);
-  RUN_TEST(test_ToString, 573);
+  RUN_TEST(test_Helpers1, 149);
+  RUN_TEST(test_Normalise, 169);
+  RUN_TEST(test_SignNoFrac, 183);
+  RUN_TEST(test_SignWithFrac, 195);
+  RUN_TEST(test_CmpFracEQ, 210);
+  RUN_TEST(test_CmpFracGT, 224);
+  RUN_TEST(test_CmpFracLT, 238);
+  RUN_TEST(test_AddFullNorm, 256);
+  RUN_TEST(test_AddFullOflow1, 270);
+  RUN_TEST(test_AddUsecNorm, 284);
+  RUN_TEST(test_AddUsecOflow1, 296);
+  RUN_TEST(test_SubFullNorm, 312);
+  RUN_TEST(test_SubFullOflow, 326);
+  RUN_TEST(test_SubUsecNorm, 340);
+  RUN_TEST(test_SubUsecOflow, 352);
+  RUN_TEST(test_Neg, 368);
+  RUN_TEST(test_AbsNoFrac, 385);
+  RUN_TEST(test_AbsWithFrac, 396);
+  RUN_TEST(test_Helpers2, 412);
+  RUN_TEST(test_ToLFPbittest, 445);
+  RUN_TEST(test_ToLFPrelPos, 460);
+  RUN_TEST(test_ToLFPrelNeg, 474);
+  RUN_TEST(test_ToLFPabs, 487);
+  RUN_TEST(test_FromLFPbittest, 505);
+  RUN_TEST(test_FromLFPrelPos, 523);
+  RUN_TEST(test_FromLFPrelNeg, 536);
+  RUN_TEST(test_LFProundtrip, 550);
+  RUN_TEST(test_ToString, 569);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/timespecops.c b/tests/libntp/timespecops.c
index 3a6bf5c9c..063db1ab7 100644
--- a/tests/libntp/timespecops.c
+++ b/tests/libntp/timespecops.c
@@ -74,10 +74,7 @@ bool AssertFpClose(const l_fp m,const l_fp n, const l_fp limit)
 		return TRUE;
 	}
 	else {
-		//<< m_expr << " which is " << l_fp_wrap(m)
-		//<< "\nand\n"
-		//<< n_expr << " which is " << l_fp_wrap(n)
-		//<< "\nare not close; diff=" << l_fp_wrap(diff);
+		printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n",lfptoa(&m,10),lfptoa(&n,10),lfptoa(&diff,10)); 
 		return FALSE;
 	}
 }
@@ -92,10 +89,7 @@ bool AssertTimespecClose(const struct timespec m,const struct timespec n, const
 		return TRUE;
 	else
 	{
-		//<< m_expr << " which is " << timespec_wrap(m)
-		//<< "\nand\n"
-		//<< n_expr << " which is " << timespec_wrap(n)
-		//<< "\nare not close; diff=" << timespec_wrap(diff);
+		printf("m_expr which is %ld.%ld \nand\nn_expr which is %ld.%ld\nare not close; diff=%ld.%ldnsec\n",m.tv_sec,m.tv_nsec,n.tv_sec,n.tv_nsec,diff.tv_sec,diff.tv_nsec); 
 		return FALSE;
 	}
 }
@@ -428,7 +422,7 @@ void test_Helpers2(void) {
 				}
 				else
 				{
-					TEST_ASSERT_FALSE(AssertTimespecClose(x,y,limit));//ASSERT_PRED_FORMAT2(!isClose, x, y);
+					TEST_ASSERT_FALSE(AssertTimespecClose(x,y,limit));
 				}
 			}
 		}
@@ -451,7 +445,7 @@ void test_ToLFPbittest(void) {
 		l_fp r;
 
 		r = tspec_intv_to_lfp(a);
-		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose)); //ASSERT_PRED_FORMAT2(FpClose, E, r);
+		TEST_ASSERT_TRUE(AssertFpClose(E,r,lfpClose));
 	}
 }
 
@@ -509,7 +503,7 @@ void test_FromLFPbittest(void) {
 		r = lfp_intv_to_tspec(a);
 		// The conversion might be off by one nanosecond when
 		// comparing to calculated value.
-		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit));
 	}
 }
 
@@ -522,7 +516,7 @@ void test_FromLFPrelPos(void) {
 		struct timespec r;
 
 		r = lfp_intv_to_tspec(a);
-		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit));
 	}
 }
 
@@ -535,7 +529,7 @@ void test_FromLFPrelNeg(void) {
 		struct timespec r;
 
 		r = lfp_intv_to_tspec(a);
-		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit)); //ASSERT_PRED_FORMAT2(TimespecClose, E, r);
+		TEST_ASSERT_TRUE(AssertTimespecClose(E,r,limit));
 	}
 }
 
diff --git a/tests/libntp/timevalops.c b/tests/libntp/timevalops.c
index 07ddd4735..a969af098 100644
--- a/tests/libntp/timevalops.c
+++ b/tests/libntp/timevalops.c
@@ -63,11 +63,9 @@ bool AssertTimevalClose(const struct timeval m, const struct timeval n, const st
 	
 	else 
 	{
-		//printf("");
-		//<< m_expr << " which is " << timeval_wrap(m)
-		//<< "\nand\n"
-		//<< n_expr << " which is " << timeval_wrap(n)
-		//<< "\nare not close; diff=" << timeval_wrap(diff);
+		printf("m_expr which is %ld.%ld \nand\nn_expr which is %ld.%ld\nare not close; diff=%ld.%ldusec\n",m.tv_sec,m.tv_usec,n.tv_sec,n.tv_usec,diff.tv_sec,diff.tv_usec); 
+		//I don't have variables m_expr and n_expr in unity, those are command line arguments which only getst has!!!
+		
 		return FALSE;
 	}
 }
@@ -87,10 +85,8 @@ bool AssertFpClose(const l_fp m,const l_fp n, const l_fp limit)
 		return TRUE;
 	}
 	else {
-		//<< m_expr << " which is " << l_fp_wrap(m)
-		//<< "\nand\n"
-		//<< n_expr << " which is " << l_fp_wrap(n)
-		//<< "\nare not close; diff=" << l_fp_wrap(diff);
+		printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n",lfptoa(&m,10),lfptoa(&n,10),lfptoa(&diff,10)); 
+		//printf("m_expr which is %d.%d \nand\nn_expr which is %d.%d\nare not close; diff=%d.%dusec\n",m.l_uf,m.Ul_i,n.l_uf,n.Ul_i,diff.l_uf,diff.Ul_i); 
 		return FALSE;
 	}
 }