testcalshims.h:

  also removed progname and current_time var
testcalshims.c:
  removed progname and current_time var

bk: 557a9944uecKt-i6GQeqPweDVQ2wxw

diff --git a/tests/libntp/authkeys.c b/tests/libntp/authkeys.c
index bc5883e5e7fac3fdc5c16f8285af38e8ccd926c0..1fbb8e3c1107c44c6ea1b96b1f67785ad5609130 100644 (file)
--- a/tests/libntp/authkeys.c
+++ b/tests/libntp/authkeys.c
@@ -1,7 +1,7 @@
 /* This file contains test for both libntp/authkeys.c and libntp/authusekey.c */
 
 #include "config.h"
-#include "testcalshims.h"
+//#include "testcalshims.h"
 #include "unity.h"
 
 #ifdef OPENSSL
@@ -12,6 +12,8 @@
 #include "ntp.h"
 #include "ntp_stdlib.h"
 
+u_long current_time = 4;
+
 // old code from google test framework, moved to SetUp() for unity
 void setUp(void)
 { 

diff --git a/tests/libntp/testcalshims.c b/tests/libntp/testcalshims.c
index 563a2f38962e101b7d7fd2ce557af9659d78bfed..da59ecb34908dd16f8c9eb20799488abbfc69d8e 100644 (file)
--- a/tests/libntp/testcalshims.c
+++ b/tests/libntp/testcalshims.c
@@ -4,8 +4,8 @@
  *  and that is normally defined in ntpd/ntpq/...
  */
 
-u_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.
-const char *progname = "libntptest";
+//u_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.
+//const char *progname = "libntptest";
 
 //static //should be static in c 
 static time_t nowtime = 0;

diff --git a/tests/libntp/testcalshims.h b/tests/libntp/testcalshims.h
index 8d6cbea2beb55a31ee6931a05ae0ba06e24610e4..bd4c681acc27925743acb5b73c4bc2f702efe913 100644 (file)
--- a/tests/libntp/testcalshims.h
+++ b/tests/libntp/testcalshims.h
@@ -4,8 +4,8 @@
 #include "ntp_stdlib.h"
 #include "ntp_calendar.h"
 
-u_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.
-const char *progname = "libntptest";
+//u_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.
+//const char *progname = "libntptest";
 
 static time_t timefunc(time_t*);
 static time_t nowtime;