removed some spaces from Makefile.am, removed init_auth from setUp, because every...

bk: 55745fe96kr50yxc8edcyQapPlIpsw

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index ab37af4bb9ed74282f99a9b233b16495b1dbe209..cdb5a4f5bf21cb83e71297a490b821967a9b4172 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -179,10 +179,6 @@ test_a_md5encrypt_LDADD =                   \
        -lm     
        $(NULL)
 
-
-
-
-
 test_atouint_CFLAGS =                  \
        -I$(top_srcdir)/sntp/unity      \
        $(NULL)
@@ -201,6 +197,7 @@ test_authkeys_LDADD =                           \
        -lm                                     \
        $(NULL)
 
+
 #removed one combined test, because unity devs suggested we use one program per test
 #test_libntp_SOURCES =                         \
 #      modetoa.c                       \

diff --git a/tests/libntp/authkeys.c b/tests/libntp/authkeys.c
index 437c73700ed8368484ff6c8ee22b7bca7793fb07..bc5883e5e7fac3fdc5c16f8285af38e8ccd926c0 100644 (file)
--- a/tests/libntp/authkeys.c
+++ b/tests/libntp/authkeys.c
@@ -15,6 +15,8 @@
 // old code from google test framework, moved to SetUp() for unity
 void setUp(void)
 { 
+       //init_lib();
+       
 /*
         * init_auth() is called by tests_main.cpp earlier.  It
         * does not initialize global variables like

diff --git a/tests/libntp/run-test-authkeys.c b/tests/libntp/run-test-authkeys.c
index 5ac6ef52f05290dd71fec4c5aabed26591815c14..eecb25870c5e29adefc72be9dc80f3f50014b926 100644 (file)
--- a/tests/libntp/run-test-authkeys.c
+++ b/tests/libntp/run-test-authkeys.c
@@ -45,14 +45,16 @@ void resetTest()
 //=======MAIN=====
 int main(void)
 {
+       init_auth();
+
   Unity.TestFile = "authkeys.c";
   UnityBegin("authkeys.c");
-  RUN_TEST(test_AddTrustedKeys, 59);
-  RUN_TEST(test_AddUntrustedKey, 70);
-  RUN_TEST(test_HaveKeyCorrect, 78);
-  RUN_TEST(test_HaveKeyIncorrect, 87);
-  RUN_TEST(test_AddWithAuthUseKey, 94);
-  RUN_TEST(test_EmptyKey, 101);
+  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);
 
   return (UnityEnd());
 }