edited a makefile in test/libntp to build those tests

bk: 557e04257nfzMhLw0x3PrGpwHR-l_g

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 01c6f4d60c602da5e50c9eeb090f35617bfbab6b..66f3cb0e59179125513aa4201cbab74059de06dc 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -6,7 +6,8 @@ run_unity =     cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb
 
 #removed test-libntp
 check_PROGRAMS = test-modetoa test-uglydate test-ymd2yd test-statestr test-numtoa test-numtohost \
-test-hextoint test-atoint test-atouint test-authkeys test-a_md5encrypt test-lfpfunc
+test-hextoint test-atoint test-atouint test-authkeys test-a_md5encrypt test-lfpfunc test-prettydate \
+test-recvbuff test-tstotv test-vi64ops test-msyslog test-caltontp
 
 if GTEST_AVAILABLE
 check_PROGRAMS += tests
@@ -52,7 +53,7 @@ tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp     \
                buftvtots.cpp           \
                calendar.cpp            \
                caljulian.cpp           \
-               caltontp.cpp            \
+               g_caltontp.cpp          \
                calyearstart.cpp        \
                clocktime.cpp           \
                decodenetnum.cpp        \
@@ -62,13 +63,13 @@ tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp   \
                g_lfpfunc.cpp           \
                lfptostr.cpp            \
                g_modetoa.cpp           \
-               msyslog.cpp             \
+               g_msyslog.cpp           \
                netof.cpp               \
                g_numtoa.cpp            \
                g_numtohost.cpp         \
                octtoint.cpp            \
-               prettydate.cpp          \
-               recvbuff.cpp            \
+               g_prettydate.cpp                \
+               g_recvbuff.cpp          \
                refnumtoa.cpp           \
                sfptostr.cpp            \
                socktoa.cpp             \
@@ -78,10 +79,10 @@ tests_SOURCES = $(top_srcdir)/sntp/tests_main.cpp   \
                timespecops.cpp         \
                timestructs.cpp         \
                timevalops.cpp          \
-               tstotv.cpp              \
+               g_tstotv.cpp            \
                tvtots.cpp              \
                g_uglydate.cpp          \
-               vi64ops.cpp             \
+               g_vi64ops.cpp           \
                g_ymd2yd.cpp            \
                $(NULL)
 
@@ -204,6 +205,54 @@ test_lfpfunc_LDADD =                       \
        $(unity_tests_LDADD)            \
        $(NULL)
 
+test_prettydate_CFLAGS =                       \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_prettydate_LDADD =                                \
+       $(LDADD)                                \
+       $(top_builddir)/sntp/unity/libunity.a   \
+       $(NULL)
+
+test_recvbuff_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_recvbuff_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+
+test_tstotv_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_tstotv_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+
+test_vi64ops_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_vi64ops_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+
+test_msyslog_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_msyslog_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
+
+test_caltontp_CFLAGS =                  \
+       -I$(top_srcdir)/sntp/unity      \
+       $(NULL)
+
+test_caltontp_LDADD =                   \
+       $(unity_tests_LDADD)
+       $(NULL)
 
 
 
@@ -276,6 +325,41 @@ test_lfpfunc_SOURCES =                             \
        run-test-lfpfunc.c                      \
        $(NULL)
 
+test_prettydate_SOURCES =              \
+       prettydate.c                    \
+       run-test-prettydate.c                   \
+       $(NULL)
+
+test_recvbuff_SOURCES =                \
+       recvbuff.c                      \
+       run-test-recvbuff.c                     \
+       $(NULL)
+
+test_tstotv_SOURCES =          \
+       tstotv.c                        \
+       run-test-tstotv.c                       \
+       $(NULL)
+
+test_vi64ops_SOURCES =                 \
+       vi64ops.c                       \
+       run-test-vi64ops.c                      \
+       $(NULL)
+
+test_msyslog_SOURCES =                 \
+       msyslog.c                       \
+       run-test-msyslog.c                      \
+       $(NULL)
+
+test_caltontp_SOURCES =                \
+       caltontp.c                      \
+       run-test-caltontp.c                     \
+       $(NULL)
+
+test_caltontp_SOURCES =                \
+       caltontp.c                      \
+       run-test-caltontp.c                     \
+       $(NULL)
+
 
 
 $(srcdir)/run-test-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
@@ -314,6 +398,23 @@ $(srcdir)/run-test-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list)
 $(srcdir)/run-test-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list)
        $(run_unity) lfpfunc.c run-test-lfpfunc.c
 
+$(srcdir)/run-test-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list)
+       $(run_unity) prettydate.c run-test-prettydate.c
+
+$(srcdir)/run-test-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list)
+       $(run_unity) recvbuff.c run-test-recvbuff.c
+
+$(srcdir)/run-test-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list)
+       $(run_unity) tstotv.c run-test-tstotv.c
+
+$(srcdir)/run-test-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list)
+       $(run_unity) vi64ops.c run-test-vi64ops.c
+
+$(srcdir)/run-test-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list)
+       $(run_unity) msyslog.c run-test-msyslog.c
+
+$(srcdir)/run-test-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list)
+       $(run_unity) caltontp.c run-test-caltontp.c
 
 
 TESTS =