leapsec.c:

  added include to fix everything, yey!
Makefile.am:
  changed the order of libntp.a and libntpd.a, stuff builds now

bk: 55939f99_FK-vV3wGEzIemfes3---g

diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am
index 863042fb2cd04313fe810bbe790e46231a1948f1..1f23fe147b21ac1a01cc1a1519b8b96843ea0271 100644 (file)
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@ -15,8 +15,8 @@ EXTRA_PROGRAMS = tests
 endif
 
 LDADD =                                        \
-       $(top_builddir)/libntp/libntp.a \
        $(top_builddir)/ntpd/libntpd.a  \
+       $(top_builddir)/libntp/libntp.a \
        $(LDADD_LIBNTP)                 \
        $(PTHREAD_LIBS)                 \
        $(LDADD_NTP)                    \
@@ -80,14 +80,21 @@ $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list)
 TESTS =
 
 if !NTP_CROSSCOMPILE
-TESTS += tests
+TESTS += $(check_PROGRAMS)
 endif
 
 ## check-libntp.mf - automake fragment
 ## slightly adapted for deeper directory
 
-BUILT_SOURCES  += check-libntp check-libunity check-libntpd
-CLEANFILES     += check-libntp check-libunity check-libntpd
+BUILT_SOURCES  += check-libntpd check-libntp check-libunity 
+CLEANFILES     += check-libntpd check-libntp check-libunity 
+
+check-libntpd: ../../ntpd/libntpd.a
+       @echo stamp > $@
+
+../../ntpd/libntpd.a:
+       cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a
+
 
 check-libntp: ../../libntp/libntp.a
        @echo stamp > $@
@@ -95,11 +102,6 @@ check-libntp: ../../libntp/libntp.a
 ../../libntp/libntp.a:
        cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
-check-libntpd: ../../ntpd/libntpd.a
-       @echo stamp > $@
-
-../../ntpd/libntpd.a:
-       cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a
 
 check-libunity: ../../sntp/unity/libunity.a
        @echo stamp > $@

diff --git a/tests/ntpd/leapsec.c b/tests/ntpd/leapsec.c
index a196b39be291c0f9439e927d675814729800f3c4..a5568d3b1bbb1e70488344caacef751b5331bbbf 100644 (file)
--- a/tests/ntpd/leapsec.c
+++ b/tests/ntpd/leapsec.c
@@ -13,6 +13,8 @@
 #include <string.h>
 //#include <sstream>
 
+#include "test-libntp.h"
+
 static const char leap1 [] =
     "#\n"
     "#@        3610569600\n"
@@ -315,7 +317,7 @@ void setUp()
 {
        //init_lib();
        //init_auth();
-extern time_t timefunc;
+//extern time_t timefunc;
     ntpcal_set_timefunc(timefunc);
     settime(1970, 1, 1, 0, 0, 0);
     leapsec_ut_pristine();
@@ -383,11 +385,11 @@ void test_tableSelect() {
 
        pt1 = leapsec_get_table(0);
        pt2 = leapsec_get_table(0);
-       TEST_ASSERT_EQUAL(pt1, pt2);
+       TEST_ASSERT_EQUAL_MESSAGE(pt1, pt2,"first");
 
        pt1 = leapsec_get_table(1);
        pt2 = leapsec_get_table(1);
-       TEST_ASSERT_EQUAL(pt1, pt2);
+       TEST_ASSERT_EQUAL_MESSAGE(pt1, pt2,"second");
 
        pt1 = leapsec_get_table(1);
        pt2 = leapsec_get_table(0);
@@ -413,6 +415,7 @@ void test_tableSelect() {
 
 // ----------------------------------------------------------------------
 // load file & check expiration
+
 void test_loadFileExpire() {
        const char *cp = leap1;
        int rc;
@@ -420,7 +423,7 @@ void test_loadFileExpire() {
 
        rc =   leapsec_load(pt, stringreader, &cp, FALSE)
            && leapsec_set_table(pt);
-       TEST_ASSERT_EQUAL(1, rc);
+       TEST_ASSERT_EQUAL_MESSAGE(1, rc,"first");
        rc = leapsec_expired(3439756800u, NULL);
        TEST_ASSERT_EQUAL(0, rc);
        rc = leapsec_expired(3610569601u, NULL);
@@ -429,6 +432,7 @@ void test_loadFileExpire() {
 
 // ----------------------------------------------------------------------
 // load file & check time-to-live
+
 void test_loadFileTTL() {
        const char *cp = leap1;
        int rc;

diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c
index 42cf08d84cd4215a5b7ba406b88b9b01adfb23da..fe37169478f639e50f05b62adafc7139d80716f6 100644 (file)
--- a/tests/ntpd/run-leapsec.c
+++ b/tests/ntpd/run-leapsec.c
@@ -78,39 +78,39 @@ int main(int argc, char *argv[])
   progname = argv[0];
   Unity.TestFile = "leapsec.c";
   UnityBegin("leapsec.c");
-  RUN_TEST(test_ValidateGood, 334);
-  RUN_TEST(test_ValidateNoHash, 341);
-  RUN_TEST(test_ValidateBad, 348);
-  RUN_TEST(test_ValidateMalformed, 355);
-  RUN_TEST(test_ValidateMalformedShort, 362);
-  RUN_TEST(test_ValidateNoLeadZero, 369);
-  RUN_TEST(test_tableSelect, 381);
-  RUN_TEST(test_loadFileExpire, 416);
-  RUN_TEST(test_loadFileTTL, 432);
-  RUN_TEST(test_lsQueryPristineState, 464);
-  RUN_TEST(test_ls2009faraway, 476);
-  RUN_TEST(test_ls2009weekaway, 493);
-  RUN_TEST(test_ls2009houraway, 510);
-  RUN_TEST(test_ls2009secaway, 527);
-  RUN_TEST(test_ls2009onspot, 544);
-  RUN_TEST(test_ls2009nodata, 561);
-  RUN_TEST(test_ls2009limdata, 578);
-  RUN_TEST(test_qryJumpFarAhead, 599);
-  RUN_TEST(test_qryJumpAheadToTransition, 621);
-  RUN_TEST(test_qryJumpAheadOverTransition, 643);
-  RUN_TEST(test_addDynamic, 669);
-  RUN_TEST(test_taiEmptyTable, 847);
-  RUN_TEST(test_taiTableFixed, 859);
-  RUN_TEST(test_taiTableDynamic, 871);
-  RUN_TEST(test_taiTableDynamicDeadZone, 897);
-  RUN_TEST(test_ls2009seqInsElectric, 917);
-  RUN_TEST(test_ls2009seqInsDumb, 960);
-  RUN_TEST(test_ls2009seqDelElectric, 1008);
-  RUN_TEST(test_ls2009seqDelDumb, 1051);
-  RUN_TEST(test_ls2012seqInsElectric, 1093);
-  RUN_TEST(test_ls2012seqInsDumb, 1136);
-  RUN_TEST(test_lsEmptyTableDumb, 1185);
-  RUN_TEST(test_lsEmptyTableElectric, 1210);
+  RUN_TEST(test_ValidateGood, 336);
+  RUN_TEST(test_ValidateNoHash, 343);
+  RUN_TEST(test_ValidateBad, 350);
+  RUN_TEST(test_ValidateMalformed, 357);
+  RUN_TEST(test_ValidateMalformedShort, 364);
+  RUN_TEST(test_ValidateNoLeadZero, 371);
+  RUN_TEST(test_tableSelect, 383);
+  RUN_TEST(test_loadFileExpire, 419);
+  RUN_TEST(test_loadFileTTL, 436);
+  RUN_TEST(test_lsQueryPristineState, 468);
+  RUN_TEST(test_ls2009faraway, 480);
+  RUN_TEST(test_ls2009weekaway, 497);
+  RUN_TEST(test_ls2009houraway, 514);
+  RUN_TEST(test_ls2009secaway, 531);
+  RUN_TEST(test_ls2009onspot, 548);
+  RUN_TEST(test_ls2009nodata, 565);
+  RUN_TEST(test_ls2009limdata, 582);
+  RUN_TEST(test_qryJumpFarAhead, 603);
+  RUN_TEST(test_qryJumpAheadToTransition, 625);
+  RUN_TEST(test_qryJumpAheadOverTransition, 647);
+  RUN_TEST(test_addDynamic, 673);
+  RUN_TEST(test_taiEmptyTable, 851);
+  RUN_TEST(test_taiTableFixed, 863);
+  RUN_TEST(test_taiTableDynamic, 875);
+  RUN_TEST(test_taiTableDynamicDeadZone, 901);
+  RUN_TEST(test_ls2009seqInsElectric, 921);
+  RUN_TEST(test_ls2009seqInsDumb, 964);
+  RUN_TEST(test_ls2009seqDelElectric, 1012);
+  RUN_TEST(test_ls2009seqDelDumb, 1055);
+  RUN_TEST(test_ls2012seqInsElectric, 1097);
+  RUN_TEST(test_ls2012seqInsDumb, 1140);
+  RUN_TEST(test_lsEmptyTableDumb, 1189);
+  RUN_TEST(test_lsEmptyTableElectric, 1214);
 
   return (UnityEnd());
 }