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

authkeys.c:
  added code which runs init_auth() only in the 1st setUp, prevents segfault
generate_test_runner.rb:
  removed init_lib() and init_auth() from here. Put it into setUp() in the test, but it should be run only once

bk: 557aa5e53yHP7JP41B3LCdQalfrvjQ
---

diff --git a/sntp/unity/auto/generate_test_runner.rb b/sntp/unity/auto/generate_test_runner.rb
index 0a02c70f1..ada8aa5ae 100644
--- a/sntp/unity/auto/generate_test_runner.rb
+++ b/sntp/unity/auto/generate_test_runner.rb
@@ -250,8 +250,9 @@ class UnityTestRunnerGenerator
     #output.puts("\nu_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.\n");
   
     output.puts("  progname = argv[0];\n")    
-    output.puts("  init_lib();\n")
-    output.puts("  init_auth();\n")	
+    #not necessary after all
+    #output.puts("  init_lib();\n")
+    #output.puts("  init_auth();\n")	
     output.puts("  suite_setup();") unless @options[:suite_setup].nil?
     output.puts("  Unity.TestFile = \"#{filename}\";")
     output.puts("  UnityBegin(\"#{filename}\");")
diff --git a/tests/libntp/authkeys.c b/tests/libntp/authkeys.c
index c1cc85b37..68ffb94ce 100644
--- a/tests/libntp/authkeys.c
+++ b/tests/libntp/authkeys.c
@@ -13,13 +13,17 @@
 #include "ntp_stdlib.h"
 
 u_long current_time = 4;
+int counter = 0;
+
 
 // old code from google test framework, moved to SetUp() for unity
 void setUp(void)
 { 
 //	init_lib();
-//	init_auth(); //causes segfault
-	
+	if(counter ==0){
+	counter++;
+	init_auth(); //causes segfault if called more than once
+	}
 /*
 	 * init_auth() is called by tests_main.cpp earlier.  It
 	 * does not initialize global variables like
diff --git a/tests/libntp/run-test-a_md5encrypt.c b/tests/libntp/run-test-a_md5encrypt.c
index bdc5db2dc..0f84d72da 100644
--- a/tests/libntp/run-test-a_md5encrypt.c
+++ b/tests/libntp/run-test-a_md5encrypt.c
@@ -47,8 +47,6 @@ 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 cc0f2488f..7618a50d7 100644
--- a/tests/libntp/run-test-atoint.c
+++ b/tests/libntp/run-test-atoint.c
@@ -48,8 +48,6 @@ 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 70ab0a1b0..767edabc3 100644
--- a/tests/libntp/run-test-atouint.c
+++ b/tests/libntp/run-test-atouint.c
@@ -47,8 +47,6 @@ 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 cd384f986..664675a2a 100644
--- a/tests/libntp/run-test-authkeys.c
+++ b/tests/libntp/run-test-authkeys.c
@@ -48,16 +48,14 @@ char *progname;
 int main(int argc, char *argv[])
 {
   progname = argv[0];
-  init_lib();
-  init_auth();
   Unity.TestFile = "authkeys.c";
   UnityBegin("authkeys.c");
-  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);
+  RUN_TEST(test_AddTrustedKeys, 69);
+  RUN_TEST(test_AddUntrustedKey, 80);
+  RUN_TEST(test_HaveKeyCorrect, 88);
+  RUN_TEST(test_HaveKeyIncorrect, 97);
+  RUN_TEST(test_AddWithAuthUseKey, 104);
+  RUN_TEST(test_EmptyKey, 111);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-test-hextoint.c b/tests/libntp/run-test-hextoint.c
index 1193e3b92..a5ef71f72 100644
--- a/tests/libntp/run-test-hextoint.c
+++ b/tests/libntp/run-test-hextoint.c
@@ -47,8 +47,6 @@ 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 11300e3bc..ed867c06e 100644
--- a/tests/libntp/run-test-lfpfunc.c
+++ b/tests/libntp/run-test-lfpfunc.c
@@ -51,8 +51,6 @@ 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 8a62b63ce..334e08d63 100644
--- a/tests/libntp/run-test-modetoa.c
+++ b/tests/libntp/run-test-modetoa.c
@@ -44,8 +44,6 @@ 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 55920e48a..4f8dd126d 100644
--- a/tests/libntp/run-test-numtoa.c
+++ b/tests/libntp/run-test-numtoa.c
@@ -44,8 +44,6 @@ 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 7dfd4f7b3..a87e5e3ff 100644
--- a/tests/libntp/run-test-numtohost.c
+++ b/tests/libntp/run-test-numtohost.c
@@ -43,8 +43,6 @@ 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 6ba72febb..f25b7491b 100644
--- a/tests/libntp/run-test-statestr.c
+++ b/tests/libntp/run-test-statestr.c
@@ -46,8 +46,6 @@ 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 6921a7ddc..aef5216d8 100644
--- a/tests/libntp/run-test-uglydate.c
+++ b/tests/libntp/run-test-uglydate.c
@@ -43,8 +43,6 @@ 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 28b7f0681..ede360034 100644
--- a/tests/libntp/run-test-ymd2yd.c
+++ b/tests/libntp/run-test-ymd2yd.c
@@ -46,8 +46,6 @@ 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);