From: Damir Tomic Date: Wed, 17 Jun 2015 10:32:21 +0000 (+0000) Subject: Merge bk://bk.ntp.org/ntp-stable X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d673372323338da4ba9d4959f3e60b5417e1f83;p=thirdparty%2Fntp.git Merge bk://bk.ntp.org/ntp-stable into psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/viperus/ntp-stable-unity bk: 55814cb5pFdbo-w8I5zKYNBGK79k5Q --- 4d673372323338da4ba9d4959f3e60b5417e1f83 diff --cc tests/libntp/Makefile.am index 5542ed1f3,ba89cc9ae..97cedb8da --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@@ -16,22 -10,27 +10,28 @@@ check_PROGRAMS = test-atoint \ test-atouint \ test-authkeys \ - test-a_md5encrypt \ - test-lfpfunc \ - test-vi64ops \ - test-refnumtoa \ + test-calendar \ + test-caljulian \ test-calyearstart \ test-clocktime \ - test-caljulian \ - test-calendar \ - test-octtoint \ + test-decodenetnum \ + test-hextoint \ test-hextolfp \ + test-lfpfunc \ + test-modetoa \ test-netof \ + test-numtoa \ + test-numtohost \ + test-octtoint \ + test-refnumtoa \ test-socktoa \ - test-decodenetnum \ - test-timevalops \ + test-statestr \ test-timespecops \ + test-timevalops \ + test-uglydate \ + test-vi64ops \ + test-ymd2yd \ + test-ssl_init \ $(NULL) if GTEST_AVAILABLE @@@ -477,128 -495,91 +505,94 @@@ test_calendar_SOURCES = test-libntp.c \ $(NULL) - test_timevalops_SOURCES = \ + test_timevalops_SOURCES = \ timevalops.c \ - run-test-timevalops.c \ + run-timevalops.c \ $(NULL) - test_timespecops_SOURCES = \ + test_timespecops_SOURCES = \ timespecops.c \ - run-test-timespecops.c \ - $(NULL) - - test_ssl_init_SOURCES = \ - ssl_init.c \ - run-test-ssl_init.c \ - $(NULL) - - - BUILT_SOURCES += \ - $(srcdir)/run-test-a_md5encrypt.c \ - $(srcdir)/run-test-atoint.c \ - $(srcdir)/run-test-atouint.c \ - $(srcdir)/run-test-authkeys.c \ - $(srcdir)/run-test-caljulian.c \ - $(srcdir)/run-test-calyearstart.c \ - $(srcdir)/run-test-clocktime.c \ - $(srcdir)/run-test-decodenetnum.c \ - $(srcdir)/run-test-hextoint.c \ - $(srcdir)/run-test-hextolfp.c \ - $(srcdir)/run-test-lfpfunc.c \ - $(srcdir)/run-test-modetoa.c \ - $(srcdir)/run-test-netof.c \ - $(srcdir)/run-test-numtoa.c \ - $(srcdir)/run-test-numtohost.c \ - $(srcdir)/run-test-octtoint.c \ - $(srcdir)/run-test-refnumtoa.c \ - $(srcdir)/run-test-socktoa.c \ - $(srcdir)/run-test-statestr.c \ - $(srcdir)/run-test-uglydate.c \ - $(srcdir)/run-test-vi64ops.c \ - $(srcdir)/run-test-ymd2yd.c \ - $(srcdir)/run-test-calendar.c \ - $(srcdir)/run-test-timevalops.c \ - $(srcdir)/run-test-timespecops.c \ + run-timespecops.c \ + $(srcdir)/run-test-ssl_init.c \ $(NULL) - $(srcdir)/run-test-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) - $(run_unity) modetoa.c run-test-modetoa.c + $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) + $(run_unity) modetoa.c run-modetoa.c - $(srcdir)/run-test-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) - $(run_unity) uglydate.c run-test-uglydate.c + $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) + $(run_unity) uglydate.c run-uglydate.c - $(srcdir)/run-test-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list) - $(run_unity) ymd2yd.c run-test-ymd2yd.c + $(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list) + $(run_unity) ymd2yd.c run-ymd2yd.c - $(srcdir)/run-test-statestr.c: $(srcdir)/statestr.c $(std_unity_list) - $(run_unity) statestr.c run-test-statestr.c + $(srcdir)/run-statestr.c: $(srcdir)/statestr.c $(std_unity_list) + $(run_unity) statestr.c run-statestr.c - $(srcdir)/run-test-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list) - $(run_unity) numtoa.c run-test-numtoa.c + $(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list) + $(run_unity) numtoa.c run-numtoa.c - $(srcdir)/run-test-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list) - $(run_unity) numtohost.c run-test-numtohost.c + $(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list) + $(run_unity) numtohost.c run-numtohost.c - $(srcdir)/run-test-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list) - $(run_unity) hextoint.c run-test-hextoint.c + $(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list) + $(run_unity) hextoint.c run-hextoint.c - $(srcdir)/run-test-atoint.c: $(srcdir)/atoint.c $(std_unity_list) - $(run_unity) atoint.c run-test-atoint.c + $(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list) + $(run_unity) atoint.c run-atoint.c - $(srcdir)/run-test-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list) - $(run_unity) octtoint.c run-test-octtoint.c + $(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list) + $(run_unity) octtoint.c run-octtoint.c - $(srcdir)/run-test-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list) - $(run_unity) hextolfp.c run-test-hextolfp.c + $(srcdir)/run-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list) + $(run_unity) hextolfp.c run-hextolfp.c - $(srcdir)/run-test-netof.c: $(srcdir)/netof.c $(std_unity_list) - $(run_unity) netof.c run-test-netof.c + $(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list) + $(run_unity) netof.c run-netof.c - $(srcdir)/run-test-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) - $(run_unity) decodenetnum.c run-test-decodenetnum.c + $(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) + $(run_unity) decodenetnum.c run-decodenetnum.c - $(srcdir)/run-test-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list) - $(run_unity) socktoa.c run-test-socktoa.c + $(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list) + $(run_unity) socktoa.c run-socktoa.c - $(srcdir)/run-test-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list) - $(run_unity) a_md5encrypt.c run-test-a_md5encrypt.c + $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list) + $(run_unity) a_md5encrypt.c run-a_md5encrypt.c - $(srcdir)/run-test-atouint.c: $(srcdir)/atouint.c $(std_unity_list) - $(run_unity) atouint.c run-test-atouint.c + $(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list) + $(run_unity) atouint.c run-atouint.c - $(srcdir)/run-test-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list) - $(run_unity) authkeys.c run-test-authkeys.c + $(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list) + $(run_unity) authkeys.c run-authkeys.c - $(srcdir)/run-test-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list) - $(run_unity) lfpfunc.c run-test-lfpfunc.c + $(srcdir)/run-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list) + $(run_unity) lfpfunc.c run-lfpfunc.c - $(srcdir)/run-test-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list) - $(run_unity) vi64ops.c run-test-vi64ops.c + $(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list) + $(run_unity) vi64ops.c run-vi64ops.c - $(srcdir)/run-test-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list) - $(run_unity) refnumtoa.c run-test-refnumtoa.c + $(srcdir)/run-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list) + $(run_unity) refnumtoa.c run-refnumtoa.c - $(srcdir)/run-test-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list) - $(run_unity) calyearstart.c run-test-calyearstart.c + $(srcdir)/run-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list) + $(run_unity) calyearstart.c run-calyearstart.c - $(srcdir)/run-test-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list) - $(run_unity) clocktime.c run-test-clocktime.c + $(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list) + $(run_unity) clocktime.c run-clocktime.c - $(srcdir)/run-test-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list) - $(run_unity) caljulian.c run-test-caljulian.c + $(srcdir)/run-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list) + $(run_unity) caljulian.c run-caljulian.c - $(srcdir)/run-test-calendar.c: $(srcdir)/calendar.c $(std_unity_list) - $(run_unity) calendar.c run-test-calendar.c + $(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list) + $(run_unity) calendar.c run-calendar.c - $(srcdir)/run-test-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list) - $(run_unity) timevalops.c run-test-timevalops.c + $(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list) + $(run_unity) timevalops.c run-timevalops.c - $(srcdir)/run-test-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list) - $(run_unity) timespecops.c run-test-timespecops.c + $(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list) + $(run_unity) timespecops.c run-timespecops.c +$(srcdir)/run-test-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list) + $(run_unity) ssl_init.c run-test-ssl_init.c TESTS =