From: Damir Tomic <viperus@ntp.org>
Date: Fri, 12 Jun 2015 09:14:36 +0000 (+0200)
Subject: test-libntp.c:
X-Git-Tag: NTP_4_3_40~6^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c318956c970b9dd70f53221d5737e7f926c84e98;p=thirdparty%2Fntp.git

test-libntp.c:
  removed stuff that was placed elsewhere

bk: 557aa2fc8qSUU7Nj1UCBifOYKRBrOw
---

diff --git a/tests/libntp/run-test-a_md5encrypt.c b/tests/libntp/run-test-a_md5encrypt.c
index 0f84d72da..bdc5db2dc 100644
--- a/tests/libntp/run-test-a_md5encrypt.c
+++ b/tests/libntp/run-test-a_md5encrypt.c
@@ -47,6 +47,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "a_md5encrypt.c";
   UnityBegin("a_md5encrypt.c");
   RUN_TEST(test_Encrypt, 39);
diff --git a/tests/libntp/run-test-atoint.c b/tests/libntp/run-test-atoint.c
index 7618a50d7..cc0f2488f 100644
--- a/tests/libntp/run-test-atoint.c
+++ b/tests/libntp/run-test-atoint.c
@@ -48,6 +48,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "atoint.c";
   UnityBegin("atoint.c");
   RUN_TEST(test_RegularPositive, 4);
diff --git a/tests/libntp/run-test-atouint.c b/tests/libntp/run-test-atouint.c
index 767edabc3..70ab0a1b0 100644
--- a/tests/libntp/run-test-atouint.c
+++ b/tests/libntp/run-test-atouint.c
@@ -47,6 +47,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "atouint.c";
   UnityBegin("atouint.c");
   RUN_TEST(test_RegularPositive, 7);
diff --git a/tests/libntp/run-test-authkeys.c b/tests/libntp/run-test-authkeys.c
index 0e4132f8a..cd384f986 100644
--- a/tests/libntp/run-test-authkeys.c
+++ b/tests/libntp/run-test-authkeys.c
@@ -47,17 +47,17 @@ char *progname;
 //=======MAIN=====
 int main(int argc, char *argv[])
 {
-  init_auth();
-
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "authkeys.c";
   UnityBegin("authkeys.c");
-  RUN_TEST(test_AddTrustedKeys, 61);
-  RUN_TEST(test_AddUntrustedKey, 72);
-  RUN_TEST(test_HaveKeyCorrect, 80);
-  RUN_TEST(test_HaveKeyIncorrect, 89);
-  RUN_TEST(test_AddWithAuthUseKey, 96);
-  RUN_TEST(test_EmptyKey, 103);
+  RUN_TEST(test_AddTrustedKeys, 65);
+  RUN_TEST(test_AddUntrustedKey, 76);
+  RUN_TEST(test_HaveKeyCorrect, 84);
+  RUN_TEST(test_HaveKeyIncorrect, 93);
+  RUN_TEST(test_AddWithAuthUseKey, 100);
+  RUN_TEST(test_EmptyKey, 107);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-test-hextoint.c b/tests/libntp/run-test-hextoint.c
index a5ef71f72..1193e3b92 100644
--- a/tests/libntp/run-test-hextoint.c
+++ b/tests/libntp/run-test-hextoint.c
@@ -47,6 +47,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "hextoint.c";
   UnityBegin("hextoint.c");
   RUN_TEST(test_SingleDigit, 8);
diff --git a/tests/libntp/run-test-lfpfunc.c b/tests/libntp/run-test-lfpfunc.c
index ed867c06e..11300e3bc 100644
--- a/tests/libntp/run-test-lfpfunc.c
+++ b/tests/libntp/run-test-lfpfunc.c
@@ -51,6 +51,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "lfpfunc.c";
   UnityBegin("lfpfunc.c");
   RUN_TEST(test_AdditionLR, 327);
diff --git a/tests/libntp/run-test-modetoa.c b/tests/libntp/run-test-modetoa.c
index 334e08d63..8a62b63ce 100644
--- a/tests/libntp/run-test-modetoa.c
+++ b/tests/libntp/run-test-modetoa.c
@@ -44,6 +44,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "modetoa.c";
   UnityBegin("modetoa.c");
   RUN_TEST(test_KnownMode, 9);
diff --git a/tests/libntp/run-test-numtoa.c b/tests/libntp/run-test-numtoa.c
index 4f8dd126d..55920e48a 100644
--- a/tests/libntp/run-test-numtoa.c
+++ b/tests/libntp/run-test-numtoa.c
@@ -44,6 +44,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "numtoa.c";
   UnityBegin("numtoa.c");
   RUN_TEST(test_Address, 15);
diff --git a/tests/libntp/run-test-numtohost.c b/tests/libntp/run-test-numtohost.c
index a87e5e3ff..7dfd4f7b3 100644
--- a/tests/libntp/run-test-numtohost.c
+++ b/tests/libntp/run-test-numtohost.c
@@ -43,6 +43,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "numtohost.c";
   UnityBegin("numtohost.c");
   RUN_TEST(test_LoopbackNetNonResolve, 7);
diff --git a/tests/libntp/run-test-statestr.c b/tests/libntp/run-test-statestr.c
index f25b7491b..6ba72febb 100644
--- a/tests/libntp/run-test-statestr.c
+++ b/tests/libntp/run-test-statestr.c
@@ -46,6 +46,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "statestr.c";
   UnityBegin("statestr.c");
   RUN_TEST(test_PeerRestart, 19);
diff --git a/tests/libntp/run-test-uglydate.c b/tests/libntp/run-test-uglydate.c
index aef5216d8..6921a7ddc 100644
--- a/tests/libntp/run-test-uglydate.c
+++ b/tests/libntp/run-test-uglydate.c
@@ -43,6 +43,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "uglydate.c";
   UnityBegin("uglydate.c");
   RUN_TEST(test_ConstantDateTime, 10);
diff --git a/tests/libntp/run-test-ymd2yd.c b/tests/libntp/run-test-ymd2yd.c
index ede360034..28b7f0681 100644
--- a/tests/libntp/run-test-ymd2yd.c
+++ b/tests/libntp/run-test-ymd2yd.c
@@ -46,6 +46,8 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
+  init_lib();
+  init_auth();
   Unity.TestFile = "ymd2yd.c";
   UnityBegin("ymd2yd.c");
   RUN_TEST(test_NonLeapYearFebruary, 13);
diff --git a/tests/libntp/test-libntp.c b/tests/libntp/test-libntp.c
index 06599d4c8..f42e0d106 100644
--- a/tests/libntp/test-libntp.c
+++ b/tests/libntp/test-libntp.c
@@ -4,11 +4,12 @@
 #include "ntp_calendar.h"
 #include "test-libntp.h"
 
-const char *progname = "test-libntp";
+//const char *progname = "test-libntp";
 
 // current_time is needed by authkeys. Used only in to calculate lifetime.
-u_long current_time = 4;
+//u_long current_time = 4;
 
+/*
 void
 setUp(void)
 {
@@ -35,3 +36,4 @@ test_uglydate(void)
 printf("uglydate:test_ConstantDateTime()\n");
 	test_ConstantDateTime();
 }
+*/