From: Tomasz Flendrich Date: Fri, 19 Jun 2015 23:14:22 +0000 (+0000) Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity X-Git-Tag: NTP_4_3_43~2^2~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=050010110b77b256afb2a2fad366099c652ec15e;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity into psp-deb1.ntp.org:/home/tflendrich/kod/head/ntp-stable-unity bk: 5584a24eUbCiS04nWnWmxmkLkFxGMg --- 050010110b77b256afb2a2fad366099c652ec15e diff --cc tests/libntp/Makefile.am index 8da86031b,edd02c3f3..91d02970a --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@@ -18,27 -17,24 +18,30 @@@ check_PROGRAMS = test-decodenetnum \ test-hextoint \ test-hextolfp \ + test-humandate \ test-lfpfunc \ + test-lfptostr \ test-modetoa \ - test-netof \ - test-numtoa \ + test-msyslog \ + test-netof \ + test-numtoa \ test-numtohost \ test-octtoint \ + test-prettydate \ + test-recvbuff \ test-refnumtoa \ + test-sfptostr \ test-ssl_init \ test-socktoa \ test-statestr \ + test-strtolfp \ test-timespecops \ test-timevalops \ + test-tstotv \ + test-tvtots \ test-uglydate \ test-vi64ops \ - test-ymd2yd \ + test-ymd2yd \ $(NULL) if GTEST_AVAILABLE @@@ -92,19 -88,19 +95,19 @@@ tests_SOURCES = g_decodenetnum.cpp \ g_hextoint.cpp \ g_hextolfp.cpp \ - humandate.cpp \ + g_humandate.cpp \ g_lfpfunc.cpp \ - lfptostr.cpp \ + g_lfptostr.cpp \ g_modetoa.cpp \ - msyslog.cpp \ - g_netof.cpp \ + g_msyslog.cpp \ + g_netof.cpp \ g_numtoa.cpp \ g_numtohost.cpp \ g_octtoint.cpp \ - prettydate.cpp \ - recvbuff.cpp \ + g_prettydate.cpp \ + g_recvbuff.cpp \ g_refnumtoa.cpp \ - sfptostr.cpp \ + g_sfptostr.cpp \ g_socktoa.cpp \ g_ssl_init.cpp \ g_statestr.cpp \ @@@ -112,8 -108,8 +115,8 @@@ g_timespecops.cpp \ timestructs.cpp \ g_timevalops.cpp \ - g_tstotv.cpp \ - tvtots.cpp \ - tstotv.cpp \ ++ g_tstotv.cpp \ + g_tvtots.cpp \ g_uglydate.cpp \ g_vi64ops.cpp \ g_ymd2yd.cpp \ @@@ -131,24 -126,21 +134,27 @@@ BUILT_SOURCES += $(srcdir)/run-decodenetnum.c \ $(srcdir)/run-hextoint.c \ $(srcdir)/run-hextolfp.c \ + $(srcdir)/run-humandate.c \ $(srcdir)/run-lfpfunc.c \ + $(srcdir)/run-lfptostr.c \ $(srcdir)/run-modetoa.c \ + $(srcdir)/run-msyslog.c \ $(srcdir)/run-netof.c \ $(srcdir)/run-numtoa.c \ $(srcdir)/run-numtohost.c \ $(srcdir)/run-octtoint.c \ + $(srcdir)/run-prettydate.c \ + $(srcdir)/run-recvbuff.c \ $(srcdir)/run-refnumtoa.c \ + $(srcdir)/run-sfptostr.c \ $(srcdir)/run-ssl_init.c \ $(srcdir)/run-socktoa.c \ $(srcdir)/run-statestr.c \ + $(srcdir)/run-strtolfp.c \ $(srcdir)/run-timevalops.c \ $(srcdir)/run-timespecops.c \ + $(srcdir)/run-tstotv.c \ + $(srcdir)/run-tvtots.c \ $(srcdir)/run-uglydate.c \ $(srcdir)/run-vi64ops.c \ $(srcdir)/run-ymd2yd.c \ @@@ -416,48 -392,31 +422,77 @@@ test_ssl_init_LDADD = $(top_builddir)/sntp/unity/libunity.a \ $(NULL) + test_tvtots_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + -DUNITY_INCLUDE_DOUBLE \ + $(NULL) + + test_tvtots_LDADD = \ + $(LDADD) \ + $(top_builddir)/sntp/unity/libunity.a \ + $(NULL) + + test_sfptostr_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + -DUNITY_INCLUDE_DOUBLE \ + $(NULL) + + test_sfptostr_LDADD = \ + $(LDADD) \ + $(top_builddir)/sntp/unity/libunity.a \ + $(NULL) + + test_humandate_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + $(NULL) + + test_humandate_LDADD = \ ++ $(LDADD) \ ++ $(top_builddir)/sntp/unity/libunity.a \ ++ $(NULL) ++ +test_caltontp_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + $(NULL) + +test_caltontp_LDADD = \ + $(LDADD) \ + $(top_builddir)/sntp/unity/libunity.a \ + -lpthread \ + $(NULL) + +test_msyslog_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + $(NULL) + +test_msyslog_LDADD = \ + $(LDADD) \ + $(top_builddir)/sntp/unity/libunity.a \ + $(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 = \ + $(LDADD) \ + $(top_builddir)/sntp/unity/libunity.a \ + $(NULL) + +test_tstotv_CFLAGS = \ + -I$(top_srcdir)/sntp/unity \ + $(NULL) + +test_tstotv_LDADD = \ $(LDADD) \ $(top_builddir)/sntp/unity/libunity.a \ $(NULL) @@@ -607,29 -556,19 +642,43 @@@ test_ssl_init_SOURCES = run-ssl_init.c \ $(NULL) + test_tvtots_SOURCES = \ + tvtots.c \ + run-tvtots.c \ + $(NULL) + + test_sfptostr_SOURCES = \ + sfptostr.c \ + run-sfptostr.c \ + $(NULL) + + test_humandate_SOURCES = \ + humandate.c \ + run-humandate.c \ ++ +test_caltontp_SOURCES = \ + caltontp.c \ + run-caltontp.c \ + $(NULL) + +test_msyslog_SOURCES = \ + msyslog.c \ + run-msyslog.c \ + $(NULL) + +test_prettydate_SOURCES = \ + prettydate.c \ + run-prettydate.c \ + $(NULL) + +test_recvbuff_SOURCES = \ + recvbuff.c \ + run-recvbuff.c \ + $(NULL) + +test_tstotv_SOURCES = \ + tstotv.c \ + run-tstotv.c \ $(NULL) $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) @@@ -716,21 -649,15 +765,30 @@@ $(srcdir)/run-timespecops.c: $(srcdir)/ $(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list) $(run_unity) ssl_init.c run-ssl_init.c + $(srcdir)/run-tvtots.c: $(srcdir)/tvtots.c $(std_unity_list) + $(run_unity) tvtots.c run-tvtots.c + + $(srcdir)/run-sfptostr.c: $(srcdir)/sfptostr.c $(std_unity_list) + $(run_unity) sfptostr.c run-sfptostr.c + + $(srcdir)/run-humandate.c: $(srcdir)/humandate.c $(std_unity_list) + $(run_unity) humandate.c run-humandate.c + +$(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list) + $(run_unity) caltontp.c run-caltontp.c + +$(srcdir)/run-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list) + $(run_unity) msyslog.c run-msyslog.c + +$(srcdir)/run-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list) + $(run_unity) prettydate.c run-prettydate.c + +$(srcdir)/run-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list) + $(run_unity) recvbuff.c run-recvbuff.c + +$(srcdir)/run-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list) + $(run_unity) tstotv.c run-tstotv.c + TESTS =