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 0a02c70f1f2ab1e9d5e7114f77ee9421b0befb2b..ada8aa5ae7fdf99d00534fa4315b036c4bec17a1 100644 (file)
--- 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 c1cc85b3710a6435f3e7480f6d75d038bec15d5e..68ffb94ce1a4718b9c9ec6c2b1517475cc7a51d8 100644 (file)
--- 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 bdc5db2dc212d35f292c15cdb34b84a3137e8678..0f84d72dadf5bf71252a791793fd435adb22b51d 100644 (file)
--- 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 cc0f2488f15b44404859d3179eac74ed6c2edf72..7618a50d78efca64ac6a80f1fc01feddceaf5ae1 100644 (file)
--- 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 70ab0a1b0db8412feb4f5fdd32f77e46479633f2..767edabc3550e4aaf1d4658378bb17197ba23dca 100644 (file)
--- 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 cd384f986144cf835ddb2e51eea0c946ba1a9156..664675a2a8dbdccd251704f7b55a3956a62de6f6 100644 (file)
--- 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 1193e3b92d0415133e99c6ab2be4322fecbc292f..a5ef71f7230096a3dc3d1f3641a135d8d12fc502 100644 (file)
--- 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 11300e3bca74745178af053901c126932664cb88..ed867c06ea7f8843f29c1598ec05d23337dc9f82 100644 (file)
--- 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 8a62b63ce3206d2704a221f5f1150571ab76bdbb..334e08d63afc098b733d047edecf1f978b04aae7 100644 (file)
--- 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 55920e48ac32cbc065f0d246f2a83f44d8512468..4f8dd126d10daca9b142af10d61ec481c1ed5d96 100644 (file)
--- 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 7dfd4f7b3d5b1480f12f660295b4a72f02a9a71c..a87e5e3ff3876b92bc0e48d2054980830bcdde99 100644 (file)
--- 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 6ba72febb8316dc2df0a0190d21d277df12eedbc..f25b7491b3a2616fd83113c940dee312ead53a51 100644 (file)
--- 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 6921a7ddc2adcef66394759f7ca36f0a7ac22499..aef5216d8cd42034ed5143c5b0317400f207ffd6 100644 (file)
--- 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 28b7f06814f1a3f937b33344e07eb37232dba189..ede360034397841948f22c959a77c7e823f83af7 100644 (file)
--- 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);