diff options
Diffstat (limited to 'tests')
80 files changed, 1358 insertions, 699 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 8fb4546ac146b..540e8d495fd5f 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -99,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am index d679ac47be877..be88a5a30e9fd 100644 --- a/tests/bug-2803/Makefile.am +++ b/tests/bug-2803/Makefile.am @@ -3,14 +3,19 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) check_PROGRAMS = bug-2803 +EXTRA_DIST = \ + testconf.yml \ + $(NULL) + # HMS: we may not need some of these: LDADD = \ $(top_builddir)/sntp/unity/libunity.a \ @@ -18,6 +23,7 @@ LDADD = \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) @@ -41,7 +47,7 @@ bug_2803_SOURCES = \ $(NULL) $(srcdir)/run-bug-2803.c: $(srcdir)/bug-2803.c $(std_unity_list) - $(run_unity) bug-2803.c run-bug-2803.c + $(run_unity) $< $@ # HMS: we may not need some of these: #noinst_HEADERS = ntpdtest.h \ diff --git a/tests/bug-2803/Makefile.in b/tests/bug-2803/Makefile.in index 5c04ab2b630fe..2a50a9b0b03ea 100644 --- a/tests/bug-2803/Makefile.in +++ b/tests/bug-2803/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -146,7 +147,7 @@ am__DEPENDENCIES_1 = bug_2803_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -693,10 +694,15 @@ NULL = BUILT_SOURCES = check-libntp check-libunity .deps-ver CLEANFILES = check-libntp check-libunity .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb # HMS: we may not need some of these: LDADD = \ @@ -705,6 +711,7 @@ LDADD = \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) @@ -1192,7 +1199,7 @@ uninstall-am: $(srcdir)/run-bug-2803.c: $(srcdir)/bug-2803.c $(std_unity_list) - $(run_unity) bug-2803.c run-bug-2803.c + $(run_unity) $< $@ check-libntp: ../../libntp/libntp.a @echo stamp > $@ diff --git a/tests/bug-2803/run-bug-2803.c b/tests/bug-2803/run-bug-2803.c index f4066f25f826e..b25e362538a7e 100644 --- a/tests/bug-2803/run-bug-2803.c +++ b/tests/bug-2803/run-bug-2803.c @@ -32,9 +32,15 @@ extern void setUp(void); extern void tearDown(void); extern void test_main(void); -extern void test_main(void ); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -50,9 +56,9 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("bug-2803.c"); RUN_TEST(test_main, 18); - RUN_TEST(test_main, 18); return (UnityEnd()); } diff --git a/tests/bug-2803/testconf.yml b/tests/bug-2803/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/bug-2803/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am index 0d76af0265c57..6ebb1170582a4 100644 --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@ -2,11 +2,16 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) + +EXTRA_DIST = \ + testconf.yml \ + $(NULL) check_PROGRAMS = \ test-a_md5encrypt \ @@ -51,12 +56,12 @@ check_PROGRAMS = \ $(NULL) LDADD = \ + $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ $(LIBM) \ - $(top_builddir)/sntp/unity/libunity.a \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) @@ -128,7 +133,7 @@ test_a_md5encrypt_SOURCES = \ $(NULL) $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list) - $(run_unity) a_md5encrypt.c run-a_md5encrypt.c + $(run_unity) $< $@ ### @@ -138,7 +143,7 @@ test_atoint_SOURCES = \ $(NULL) $(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list) - $(run_unity) atoint.c run-atoint.c + $(run_unity) $< $@ ### @@ -148,7 +153,7 @@ test_atouint_SOURCES = \ $(NULL) $(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list) - $(run_unity) atouint.c run-atouint.c + $(run_unity) $< $@ ### @@ -158,7 +163,7 @@ test_authkeys_SOURCES = \ $(NULL) $(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list) - $(run_unity) authkeys.c run-authkeys.c + $(run_unity) $< $@ ### @@ -169,7 +174,7 @@ test_buftvtots_SOURCES = \ $(NULL) $(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list) - $(run_unity) buftvtots.c run-buftvtots.c + $(run_unity) $< $@ ### @@ -180,7 +185,7 @@ test_calendar_SOURCES = \ $(NULL) $(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list) - $(run_unity) calendar.c run-calendar.c + $(run_unity) $< $@ ### @@ -195,7 +200,7 @@ test_caltontp_SOURCES = \ $(NULL) $(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list) - $(run_unity) caltontp.c run-caltontp.c + $(run_unity) $< $@ ### @@ -211,7 +216,7 @@ test_caljulian_SOURCES = \ $(NULL) $(srcdir)/run-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list) - $(run_unity) caljulian.c run-caljulian.c + $(run_unity) $< $@ ### @@ -222,7 +227,7 @@ test_calyearstart_SOURCES = \ $(NULL) $(srcdir)/run-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list) - $(run_unity) calyearstart.c run-calyearstart.c + $(run_unity) $< $@ ### @@ -233,7 +238,7 @@ test_clocktime_SOURCES = \ $(NULL) $(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list) - $(run_unity) clocktime.c run-clocktime.c + $(run_unity) $< $@ ### @@ -249,7 +254,7 @@ test_decodenetnum_SOURCES = \ $(NULL) $(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) - $(run_unity) decodenetnum.c run-decodenetnum.c + $(run_unity) $< $@ ### @@ -259,7 +264,7 @@ test_hextoint_SOURCES = \ $(NULL) $(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list) - $(run_unity) hextoint.c run-hextoint.c + $(run_unity) $< $@ ### @@ -270,7 +275,7 @@ test_hextolfp_SOURCES = \ $(NULL) $(srcdir)/run-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list) - $(run_unity) hextolfp.c run-hextolfp.c + $(run_unity) $< $@ ### @@ -280,7 +285,7 @@ test_humandate_SOURCES = \ $(NULL) $(srcdir)/run-humandate.c: $(srcdir)/humandate.c $(std_unity_list) - $(run_unity) humandate.c run-humandate.c + $(run_unity) $< $@ ### @@ -290,7 +295,7 @@ test_lfpfunc_SOURCES = \ $(NULL) $(srcdir)/run-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list) - $(run_unity) lfpfunc.c run-lfpfunc.c + $(run_unity) $< $@ ### @@ -300,7 +305,7 @@ test_lfptostr_SOURCES = \ $(NULL) $(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list) - $(run_unity) lfptostr.c run-lfptostr.c + $(run_unity) $< $@ ### @@ -310,7 +315,7 @@ test_modetoa_SOURCES = \ $(NULL) $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) - $(run_unity) modetoa.c run-modetoa.c + $(run_unity) $< $@ ### @@ -320,7 +325,7 @@ test_msyslog_SOURCES = \ $(NULL) $(srcdir)/run-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list) - $(run_unity) msyslog.c run-msyslog.c + $(run_unity) $< $@ ### @@ -331,7 +336,7 @@ test_netof_SOURCES = \ $(NULL) $(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list) - $(run_unity) netof.c run-netof.c + $(run_unity) $< $@ ### @@ -341,7 +346,7 @@ test_numtoa_SOURCES = \ $(NULL) $(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list) - $(run_unity) numtoa.c run-numtoa.c + $(run_unity) $< $@ ### @@ -351,7 +356,7 @@ test_numtohost_SOURCES = \ $(NULL) $(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list) - $(run_unity) numtohost.c run-numtohost.c + $(run_unity) $< $@ ### @@ -361,7 +366,7 @@ test_octtoint_SOURCES = \ $(NULL) $(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list) - $(run_unity) octtoint.c run-octtoint.c + $(run_unity) $< $@ ### @@ -371,7 +376,7 @@ test_prettydate_SOURCES = \ $(NULL) $(srcdir)/run-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list) - $(run_unity) prettydate.c run-prettydate.c + $(run_unity) $< $@ ### @@ -381,7 +386,7 @@ test_recvbuff_SOURCES = \ $(NULL) $(srcdir)/run-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list) - $(run_unity) recvbuff.c run-recvbuff.c + $(run_unity) $< $@ ### @@ -391,7 +396,7 @@ test_refidsmear_SOURCES = \ $(NULL) $(srcdir)/run-refidsmear.c: $(srcdir)/refidsmear.c $(std_unity_list) - $(run_unity) refidsmear.c run-refidsmear.c + $(run_unity) $< $@ ### @@ -401,7 +406,7 @@ test_refnumtoa_SOURCES = \ $(NULL) $(srcdir)/run-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list) - $(run_unity) refnumtoa.c run-refnumtoa.c + $(run_unity) $< $@ ### @@ -411,7 +416,7 @@ test_sfptostr_SOURCES = \ $(NULL) $(srcdir)/run-sfptostr.c: $(srcdir)/sfptostr.c $(std_unity_list) - $(run_unity) sfptostr.c run-sfptostr.c + $(run_unity) $< $@ ### @@ -422,7 +427,7 @@ test_socktoa_SOURCES = \ $(NULL) $(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list) - $(run_unity) socktoa.c run-socktoa.c + $(run_unity) $< $@ ### @@ -432,7 +437,7 @@ test_ssl_init_SOURCES = \ $(NULL) $(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list) - $(run_unity) ssl_init.c run-ssl_init.c + $(run_unity) $< $@ ### @@ -442,7 +447,7 @@ test_statestr_SOURCES = \ $(NULL) $(srcdir)/run-statestr.c: $(srcdir)/statestr.c $(std_unity_list) - $(run_unity) statestr.c run-statestr.c + $(run_unity) $< $@ ### @@ -458,7 +463,7 @@ test_strtolfp_SOURCES = \ $(NULL) $(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list) - $(run_unity) strtolfp.c run-strtolfp.c + $(run_unity) $< $@ ### @@ -468,7 +473,7 @@ test_timespecops_SOURCES = \ $(NULL) $(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list) - $(run_unity) timespecops.c run-timespecops.c + $(run_unity) $< $@ ### @@ -478,7 +483,7 @@ test_timevalops_SOURCES = \ $(NULL) $(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list) - $(run_unity) timevalops.c run-timevalops.c + $(run_unity) $< $@ ### @@ -488,7 +493,7 @@ test_tsafememcmp_SOURCES = \ $(NULL) $(srcdir)/run-tsafememcmp.c: $(srcdir)/tsafememcmp.c $(std_unity_list) - $(run_unity) tsafememcmp.c run-tsafememcmp.c + $(run_unity) $< $@ ### @@ -498,7 +503,7 @@ test_tstotv_SOURCES = \ $(NULL) $(srcdir)/run-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list) - $(run_unity) tstotv.c run-tstotv.c + $(run_unity) $< $@ ### @@ -509,7 +514,7 @@ test_tvtots_SOURCES = \ $(NULL) $(srcdir)/run-tvtots.c: $(srcdir)/tvtots.c $(std_unity_list) - $(run_unity) tvtots.c run-tvtots.c + $(run_unity) $< $@ ### @@ -519,7 +524,7 @@ test_uglydate_SOURCES = \ $(NULL) $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) - $(run_unity) uglydate.c run-uglydate.c + $(run_unity) $< $@ ### @@ -529,7 +534,7 @@ test_vi64ops_SOURCES = \ $(NULL) $(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list) - $(run_unity) vi64ops.c run-vi64ops.c + $(run_unity) $< $@ ### @@ -539,7 +544,7 @@ test_ymd2yd_SOURCES = \ $(NULL) $(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list) - $(run_unity) ymd2yd.c run-ymd2yd.c + $(run_unity) $< $@ ### diff --git a/tests/libntp/Makefile.in b/tests/libntp/Makefile.in index 68de85395a34d..f483e191d244a 100644 --- a/tests/libntp/Makefile.in +++ b/tests/libntp/Makefile.in @@ -121,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -165,10 +166,11 @@ am_test_a_md5encrypt_OBJECTS = a_md5encrypt.$(OBJEXT) \ test_a_md5encrypt_OBJECTS = $(am_test_a_md5encrypt_OBJECTS) test_a_md5encrypt_LDADD = $(LDADD) am__DEPENDENCIES_1 = -test_a_md5encrypt_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_a_md5encrypt_DEPENDENCIES = \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -177,51 +179,51 @@ am_test_atoint_OBJECTS = atoint.$(OBJEXT) run-atoint.$(OBJEXT) \ $(am__objects_1) test_atoint_OBJECTS = $(am_test_atoint_OBJECTS) test_atoint_LDADD = $(LDADD) -test_atoint_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_atoint_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_atouint_OBJECTS = atouint.$(OBJEXT) run-atouint.$(OBJEXT) \ $(am__objects_1) test_atouint_OBJECTS = $(am_test_atouint_OBJECTS) test_atouint_LDADD = $(LDADD) -test_atouint_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_atouint_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_authkeys_OBJECTS = authkeys.$(OBJEXT) run-authkeys.$(OBJEXT) \ $(am__objects_1) test_authkeys_OBJECTS = $(am_test_authkeys_OBJECTS) test_authkeys_LDADD = $(LDADD) -test_authkeys_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_authkeys_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_buftvtots_OBJECTS = buftvtots.$(OBJEXT) \ run-buftvtots.$(OBJEXT) lfptest.$(OBJEXT) $(am__objects_1) test_buftvtots_OBJECTS = $(am_test_buftvtots_OBJECTS) test_buftvtots_LDADD = $(LDADD) -test_buftvtots_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_buftvtots_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_calendar_OBJECTS = calendar.$(OBJEXT) run-calendar.$(OBJEXT) \ test-libntp.$(OBJEXT) $(am__objects_1) test_calendar_OBJECTS = $(am_test_calendar_OBJECTS) test_calendar_LDADD = $(LDADD) -test_calendar_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_calendar_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_caljulian_OBJECTS = test_caljulian-caljulian.$(OBJEXT) \ test_caljulian-run-caljulian.$(OBJEXT) \ test_caljulian-test-libntp.$(OBJEXT) $(am__objects_1) test_caljulian_OBJECTS = $(am_test_caljulian_OBJECTS) test_caljulian_LDADD = $(LDADD) -test_caljulian_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_caljulian_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_caljulian_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_caljulian_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ @@ -230,10 +232,10 @@ am_test_caltontp_OBJECTS = test_caltontp-caltontp.$(OBJEXT) \ test_caltontp-run-caltontp.$(OBJEXT) $(am__objects_1) test_caltontp_OBJECTS = $(am_test_caltontp_OBJECTS) test_caltontp_LDADD = $(LDADD) -test_caltontp_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_caltontp_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_caltontp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_caltontp_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -242,28 +244,30 @@ am_test_calyearstart_OBJECTS = calyearstart.$(OBJEXT) \ $(am__objects_1) test_calyearstart_OBJECTS = $(am_test_calyearstart_OBJECTS) test_calyearstart_LDADD = $(LDADD) -test_calyearstart_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_calyearstart_DEPENDENCIES = \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_clocktime_OBJECTS = clocktime.$(OBJEXT) \ run-clocktime.$(OBJEXT) test-libntp.$(OBJEXT) $(am__objects_1) test_clocktime_OBJECTS = $(am_test_clocktime_OBJECTS) test_clocktime_LDADD = $(LDADD) -test_clocktime_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_clocktime_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_decodenetnum_OBJECTS = \ test_decodenetnum-decodenetnum.$(OBJEXT) \ test_decodenetnum-run-decodenetnum.$(OBJEXT) \ test_decodenetnum-sockaddrtest.$(OBJEXT) $(am__objects_1) test_decodenetnum_OBJECTS = $(am_test_decodenetnum_OBJECTS) test_decodenetnum_LDADD = $(LDADD) -test_decodenetnum_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_decodenetnum_DEPENDENCIES = \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_decodenetnum_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_decodenetnum_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -272,163 +276,163 @@ am_test_hextoint_OBJECTS = hextoint.$(OBJEXT) run-hextoint.$(OBJEXT) \ $(am__objects_1) test_hextoint_OBJECTS = $(am_test_hextoint_OBJECTS) test_hextoint_LDADD = $(LDADD) -test_hextoint_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_hextoint_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_hextolfp_OBJECTS = hextolfp.$(OBJEXT) run-hextolfp.$(OBJEXT) \ lfptest.$(OBJEXT) $(am__objects_1) test_hextolfp_OBJECTS = $(am_test_hextolfp_OBJECTS) test_hextolfp_LDADD = $(LDADD) -test_hextolfp_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_hextolfp_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_humandate_OBJECTS = humandate.$(OBJEXT) \ run-humandate.$(OBJEXT) $(am__objects_1) test_humandate_OBJECTS = $(am_test_humandate_OBJECTS) test_humandate_LDADD = $(LDADD) -test_humandate_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_humandate_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_lfpfunc_OBJECTS = lfpfunc.$(OBJEXT) run-lfpfunc.$(OBJEXT) \ $(am__objects_1) test_lfpfunc_OBJECTS = $(am_test_lfpfunc_OBJECTS) test_lfpfunc_LDADD = $(LDADD) -test_lfpfunc_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_lfpfunc_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_lfptostr_OBJECTS = lfptostr.$(OBJEXT) run-lfptostr.$(OBJEXT) \ $(am__objects_1) test_lfptostr_OBJECTS = $(am_test_lfptostr_OBJECTS) test_lfptostr_LDADD = $(LDADD) -test_lfptostr_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_lfptostr_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_modetoa_OBJECTS = modetoa.$(OBJEXT) run-modetoa.$(OBJEXT) \ $(am__objects_1) test_modetoa_OBJECTS = $(am_test_modetoa_OBJECTS) test_modetoa_LDADD = $(LDADD) -test_modetoa_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_modetoa_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_msyslog_OBJECTS = msyslog.$(OBJEXT) run-msyslog.$(OBJEXT) \ $(am__objects_1) test_msyslog_OBJECTS = $(am_test_msyslog_OBJECTS) test_msyslog_LDADD = $(LDADD) -test_msyslog_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_msyslog_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_netof_OBJECTS = netof.$(OBJEXT) run-netof.$(OBJEXT) \ sockaddrtest.$(OBJEXT) $(am__objects_1) test_netof_OBJECTS = $(am_test_netof_OBJECTS) test_netof_LDADD = $(LDADD) -test_netof_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_netof_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_numtoa_OBJECTS = numtoa.$(OBJEXT) run-numtoa.$(OBJEXT) \ $(am__objects_1) test_numtoa_OBJECTS = $(am_test_numtoa_OBJECTS) test_numtoa_LDADD = $(LDADD) -test_numtoa_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_numtoa_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_numtohost_OBJECTS = numtohost.$(OBJEXT) \ run-numtohost.$(OBJEXT) $(am__objects_1) test_numtohost_OBJECTS = $(am_test_numtohost_OBJECTS) test_numtohost_LDADD = $(LDADD) -test_numtohost_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_numtohost_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_octtoint_OBJECTS = octtoint.$(OBJEXT) run-octtoint.$(OBJEXT) \ $(am__objects_1) test_octtoint_OBJECTS = $(am_test_octtoint_OBJECTS) test_octtoint_LDADD = $(LDADD) -test_octtoint_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_octtoint_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_prettydate_OBJECTS = prettydate.$(OBJEXT) \ run-prettydate.$(OBJEXT) $(am__objects_1) test_prettydate_OBJECTS = $(am_test_prettydate_OBJECTS) test_prettydate_LDADD = $(LDADD) -test_prettydate_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_prettydate_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_recvbuff_OBJECTS = recvbuff.$(OBJEXT) run-recvbuff.$(OBJEXT) \ $(am__objects_1) test_recvbuff_OBJECTS = $(am_test_recvbuff_OBJECTS) test_recvbuff_LDADD = $(LDADD) -test_recvbuff_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_recvbuff_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_refidsmear_OBJECTS = refidsmear.$(OBJEXT) \ run-refidsmear.$(OBJEXT) $(am__objects_1) test_refidsmear_OBJECTS = $(am_test_refidsmear_OBJECTS) test_refidsmear_LDADD = $(LDADD) -test_refidsmear_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_refidsmear_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_refnumtoa_OBJECTS = refnumtoa.$(OBJEXT) \ run-refnumtoa.$(OBJEXT) $(am__objects_1) test_refnumtoa_OBJECTS = $(am_test_refnumtoa_OBJECTS) test_refnumtoa_LDADD = $(LDADD) -test_refnumtoa_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_refnumtoa_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_sfptostr_OBJECTS = sfptostr.$(OBJEXT) run-sfptostr.$(OBJEXT) \ $(am__objects_1) test_sfptostr_OBJECTS = $(am_test_sfptostr_OBJECTS) test_sfptostr_LDADD = $(LDADD) -test_sfptostr_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_sfptostr_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_socktoa_OBJECTS = socktoa.$(OBJEXT) run-socktoa.$(OBJEXT) \ sockaddrtest.$(OBJEXT) $(am__objects_1) test_socktoa_OBJECTS = $(am_test_socktoa_OBJECTS) test_socktoa_LDADD = $(LDADD) -test_socktoa_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_socktoa_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_ssl_init_OBJECTS = ssl_init.$(OBJEXT) run-ssl_init.$(OBJEXT) \ $(am__objects_1) test_ssl_init_OBJECTS = $(am_test_ssl_init_OBJECTS) test_ssl_init_LDADD = $(LDADD) -test_ssl_init_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_ssl_init_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_statestr_OBJECTS = statestr.$(OBJEXT) run-statestr.$(OBJEXT) \ $(am__objects_1) test_statestr_OBJECTS = $(am_test_statestr_OBJECTS) test_statestr_LDADD = $(LDADD) -test_statestr_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_statestr_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_strtolfp_OBJECTS = test_strtolfp-strtolfp.$(OBJEXT) \ test_strtolfp-run-strtolfp.$(OBJEXT) \ test_strtolfp-lfptest.$(OBJEXT) $(am__objects_1) test_strtolfp_OBJECTS = $(am_test_strtolfp_OBJECTS) test_strtolfp_LDADD = $(LDADD) -test_strtolfp_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_strtolfp_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_strtolfp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strtolfp_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -436,66 +440,66 @@ am_test_timespecops_OBJECTS = timespecops.$(OBJEXT) \ run-timespecops.$(OBJEXT) $(am__objects_1) test_timespecops_OBJECTS = $(am_test_timespecops_OBJECTS) test_timespecops_LDADD = $(LDADD) -test_timespecops_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_timespecops_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_timevalops_OBJECTS = timevalops.$(OBJEXT) \ run-timevalops.$(OBJEXT) $(am__objects_1) test_timevalops_OBJECTS = $(am_test_timevalops_OBJECTS) test_timevalops_LDADD = $(LDADD) -test_timevalops_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_timevalops_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_tsafememcmp_OBJECTS = tsafememcmp.$(OBJEXT) \ run-tsafememcmp.$(OBJEXT) $(am__objects_1) test_tsafememcmp_OBJECTS = $(am_test_tsafememcmp_OBJECTS) test_tsafememcmp_LDADD = $(LDADD) -test_tsafememcmp_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_tsafememcmp_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_tstotv_OBJECTS = tstotv.$(OBJEXT) run-tstotv.$(OBJEXT) \ $(am__objects_1) test_tstotv_OBJECTS = $(am_test_tstotv_OBJECTS) test_tstotv_LDADD = $(LDADD) -test_tstotv_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_tstotv_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_tvtots_OBJECTS = tvtots.$(OBJEXT) run-tvtots.$(OBJEXT) \ lfptest.$(OBJEXT) $(am__objects_1) test_tvtots_OBJECTS = $(am_test_tvtots_OBJECTS) test_tvtots_LDADD = $(LDADD) -test_tvtots_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_tvtots_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_uglydate_OBJECTS = uglydate.$(OBJEXT) run-uglydate.$(OBJEXT) \ $(am__objects_1) test_uglydate_OBJECTS = $(am_test_uglydate_OBJECTS) test_uglydate_LDADD = $(LDADD) -test_uglydate_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_uglydate_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_vi64ops_OBJECTS = vi64ops.$(OBJEXT) run-vi64ops.$(OBJEXT) \ $(am__objects_1) test_vi64ops_OBJECTS = $(am_test_vi64ops_OBJECTS) test_vi64ops_LDADD = $(LDADD) -test_vi64ops_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_vi64ops_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_test_ymd2yd_OBJECTS = ymd2yd.$(OBJEXT) run-ymd2yd.$(OBJEXT) \ $(am__objects_1) test_ymd2yd_OBJECTS = $(am_test_ymd2yd_OBJECTS) test_ymd2yd_LDADD = $(LDADD) -test_ymd2yd_DEPENDENCIES = $(top_builddir)/libntp/libntp.a \ +test_ymd2yd_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(top_builddir)/sntp/unity/libunity.a $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -1095,17 +1099,22 @@ BUILT_SOURCES = $(srcdir)/run-a_md5encrypt.c $(srcdir)/run-atoint.c \ .deps-ver CLEANFILES = check-libntp check-libunity .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb LDADD = \ + $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ $(LIBM) \ - $(top_builddir)/sntp/unity/libunity.a \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) @@ -2547,121 +2556,121 @@ uninstall-am: $(srcdir)/run-a_md5encrypt.c: $(srcdir)/a_md5encrypt.c $(std_unity_list) - $(run_unity) a_md5encrypt.c run-a_md5encrypt.c + $(run_unity) $< $@ $(srcdir)/run-atoint.c: $(srcdir)/atoint.c $(std_unity_list) - $(run_unity) atoint.c run-atoint.c + $(run_unity) $< $@ $(srcdir)/run-atouint.c: $(srcdir)/atouint.c $(std_unity_list) - $(run_unity) atouint.c run-atouint.c + $(run_unity) $< $@ $(srcdir)/run-authkeys.c: $(srcdir)/authkeys.c $(std_unity_list) - $(run_unity) authkeys.c run-authkeys.c + $(run_unity) $< $@ $(srcdir)/run-buftvtots.c: $(srcdir)/buftvtots.c $(std_unity_list) - $(run_unity) buftvtots.c run-buftvtots.c + $(run_unity) $< $@ $(srcdir)/run-calendar.c: $(srcdir)/calendar.c $(std_unity_list) - $(run_unity) calendar.c run-calendar.c + $(run_unity) $< $@ $(srcdir)/run-caltontp.c: $(srcdir)/caltontp.c $(std_unity_list) - $(run_unity) caltontp.c run-caltontp.c + $(run_unity) $< $@ $(srcdir)/run-caljulian.c: $(srcdir)/caljulian.c $(std_unity_list) - $(run_unity) caljulian.c run-caljulian.c + $(run_unity) $< $@ $(srcdir)/run-calyearstart.c: $(srcdir)/calyearstart.c $(std_unity_list) - $(run_unity) calyearstart.c run-calyearstart.c + $(run_unity) $< $@ $(srcdir)/run-clocktime.c: $(srcdir)/clocktime.c $(std_unity_list) - $(run_unity) clocktime.c run-clocktime.c + $(run_unity) $< $@ $(srcdir)/run-decodenetnum.c: $(srcdir)/decodenetnum.c $(std_unity_list) - $(run_unity) decodenetnum.c run-decodenetnum.c + $(run_unity) $< $@ $(srcdir)/run-hextoint.c: $(srcdir)/hextoint.c $(std_unity_list) - $(run_unity) hextoint.c run-hextoint.c + $(run_unity) $< $@ $(srcdir)/run-hextolfp.c: $(srcdir)/hextolfp.c $(std_unity_list) - $(run_unity) hextolfp.c run-hextolfp.c + $(run_unity) $< $@ $(srcdir)/run-humandate.c: $(srcdir)/humandate.c $(std_unity_list) - $(run_unity) humandate.c run-humandate.c + $(run_unity) $< $@ $(srcdir)/run-lfpfunc.c: $(srcdir)/lfpfunc.c $(std_unity_list) - $(run_unity) lfpfunc.c run-lfpfunc.c + $(run_unity) $< $@ $(srcdir)/run-lfptostr.c: $(srcdir)/lfptostr.c $(std_unity_list) - $(run_unity) lfptostr.c run-lfptostr.c + $(run_unity) $< $@ $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) - $(run_unity) modetoa.c run-modetoa.c + $(run_unity) $< $@ $(srcdir)/run-msyslog.c: $(srcdir)/msyslog.c $(std_unity_list) - $(run_unity) msyslog.c run-msyslog.c + $(run_unity) $< $@ $(srcdir)/run-netof.c: $(srcdir)/netof.c $(std_unity_list) - $(run_unity) netof.c run-netof.c + $(run_unity) $< $@ $(srcdir)/run-numtoa.c: $(srcdir)/numtoa.c $(std_unity_list) - $(run_unity) numtoa.c run-numtoa.c + $(run_unity) $< $@ $(srcdir)/run-numtohost.c: $(srcdir)/numtohost.c $(std_unity_list) - $(run_unity) numtohost.c run-numtohost.c + $(run_unity) $< $@ $(srcdir)/run-octtoint.c: $(srcdir)/octtoint.c $(std_unity_list) - $(run_unity) octtoint.c run-octtoint.c + $(run_unity) $< $@ $(srcdir)/run-prettydate.c: $(srcdir)/prettydate.c $(std_unity_list) - $(run_unity) prettydate.c run-prettydate.c + $(run_unity) $< $@ $(srcdir)/run-recvbuff.c: $(srcdir)/recvbuff.c $(std_unity_list) - $(run_unity) recvbuff.c run-recvbuff.c + $(run_unity) $< $@ $(srcdir)/run-refidsmear.c: $(srcdir)/refidsmear.c $(std_unity_list) - $(run_unity) refidsmear.c run-refidsmear.c + $(run_unity) $< $@ $(srcdir)/run-refnumtoa.c: $(srcdir)/refnumtoa.c $(std_unity_list) - $(run_unity) refnumtoa.c run-refnumtoa.c + $(run_unity) $< $@ $(srcdir)/run-sfptostr.c: $(srcdir)/sfptostr.c $(std_unity_list) - $(run_unity) sfptostr.c run-sfptostr.c + $(run_unity) $< $@ $(srcdir)/run-socktoa.c: $(srcdir)/socktoa.c $(std_unity_list) - $(run_unity) socktoa.c run-socktoa.c + $(run_unity) $< $@ $(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list) - $(run_unity) ssl_init.c run-ssl_init.c + $(run_unity) $< $@ $(srcdir)/run-statestr.c: $(srcdir)/statestr.c $(std_unity_list) - $(run_unity) statestr.c run-statestr.c + $(run_unity) $< $@ $(srcdir)/run-strtolfp.c: $(srcdir)/strtolfp.c $(std_unity_list) - $(run_unity) strtolfp.c run-strtolfp.c + $(run_unity) $< $@ $(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list) - $(run_unity) timespecops.c run-timespecops.c + $(run_unity) $< $@ $(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list) - $(run_unity) timevalops.c run-timevalops.c + $(run_unity) $< $@ $(srcdir)/run-tsafememcmp.c: $(srcdir)/tsafememcmp.c $(std_unity_list) - $(run_unity) tsafememcmp.c run-tsafememcmp.c + $(run_unity) $< $@ $(srcdir)/run-tstotv.c: $(srcdir)/tstotv.c $(std_unity_list) - $(run_unity) tstotv.c run-tstotv.c + $(run_unity) $< $@ $(srcdir)/run-tvtots.c: $(srcdir)/tvtots.c $(std_unity_list) - $(run_unity) tvtots.c run-tvtots.c + $(run_unity) $< $@ $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) - $(run_unity) uglydate.c run-uglydate.c + $(run_unity) $< $@ $(srcdir)/run-vi64ops.c: $(srcdir)/vi64ops.c $(std_unity_list) - $(run_unity) vi64ops.c run-vi64ops.c + $(run_unity) $< $@ $(srcdir)/run-ymd2yd.c: $(srcdir)/ymd2yd.c $(std_unity_list) - $(run_unity) ymd2yd.c run-ymd2yd.c + $(run_unity) $< $@ check-libntp: ../../libntp/libntp.a @echo stamp > $@ diff --git a/tests/libntp/a_md5encrypt.c b/tests/libntp/a_md5encrypt.c index a87aa796de72e..844be16fa6f8c 100644 --- a/tests/libntp/a_md5encrypt.c +++ b/tests/libntp/a_md5encrypt.c @@ -52,11 +52,9 @@ test_Encrypt(void) { packetPtr = emalloc_zero(totalLength * sizeof(*packetPtr)); memcpy(packetPtr, packet, packetLength); - cache_secretsize = keyLength; + length = MD5authencrypt(keytype, key, keyLength, packetPtr, packetLength); - length = MD5authencrypt(keytype, key, packetPtr, packetLength); - - TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, packetPtr, packetLength, length)); + TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength, packetPtr, packetLength, length)); TEST_ASSERT_EQUAL(20, length); TEST_ASSERT_EQUAL_MEMORY(expectedPacket.u8, packetPtr, totalLength); @@ -66,14 +64,12 @@ test_Encrypt(void) { void test_DecryptValid(void) { - cache_secretsize = keyLength; - TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, expectedPacket.u32, packetLength, 20)); + TEST_ASSERT_TRUE(MD5authdecrypt(keytype, key, keyLength, expectedPacket.u32, packetLength, 20)); } void test_DecryptInvalid(void) { - cache_secretsize = keyLength; - TEST_ASSERT_FALSE(MD5authdecrypt(keytype, key, invalidPacket.u32, packetLength, 20)); + TEST_ASSERT_FALSE(MD5authdecrypt(keytype, key, keyLength, invalidPacket.u32, packetLength, 20)); } void diff --git a/tests/libntp/authkeys.c b/tests/libntp/authkeys.c index fd11ef623de21..ac44f93dd6f17 100644 --- a/tests/libntp/authkeys.c +++ b/tests/libntp/authkeys.c @@ -21,19 +21,12 @@ int counter = 0; void setUp(void); void tearDown(void); void AddTrustedKey(keyid_t keyno); -void AddUntrustedKey(keyid_t keyno); -void test_AddTrustedKeys(void); -void test_AddUntrustedKey(void); -void test_HaveKeyCorrect(void); -void test_HaveKeyIncorrect(void); -void test_AddWithAuthUseKey(void); -void test_EmptyKey(void); -void test_auth_log2(void); +void AddUntrustedKey(keyid_t keyno); void setUp(void) -{ +{ if (counter == 0) { counter++; init_auth(); // causes segfault if called more than once @@ -53,17 +46,17 @@ setUp(void) cache_flags = 0; cache_secret = NULL; cache_secretsize = 0; - - return; } void tearDown(void) { - return; + /*NOP*/ } + static const int KEYTYPE = KEY_TYPE_MD5; +static char msgbuf[128]; void AddTrustedKey(keyid_t keyno) @@ -75,20 +68,16 @@ AddTrustedKey(keyid_t keyno) MD5auth_setkey(keyno, KEYTYPE, NULL, 0, NULL); authtrust(keyno, TRUE); - - return; } void AddUntrustedKey(keyid_t keyno) { authtrust(keyno, FALSE); - - return; } -void -test_AddTrustedKeys(void) +void test_AddTrustedKeys(void); +void test_AddTrustedKeys(void) { const keyid_t KEYNO1 = 5; const keyid_t KEYNO2 = 8; @@ -98,24 +87,20 @@ test_AddTrustedKeys(void) TEST_ASSERT_TRUE(authistrusted(KEYNO1)); TEST_ASSERT_TRUE(authistrusted(KEYNO2)); - - return; } -void -test_AddUntrustedKey(void) +void test_AddUntrustedKey(void); +void test_AddUntrustedKey(void) { const keyid_t KEYNO = 3; - + AddUntrustedKey(KEYNO); TEST_ASSERT_FALSE(authistrusted(KEYNO)); - - return; } -void -test_HaveKeyCorrect(void) +void test_HaveKeyCorrect(void); +void test_HaveKeyCorrect(void) { const keyid_t KEYNO = 3; @@ -123,42 +108,33 @@ test_HaveKeyCorrect(void) TEST_ASSERT_TRUE(auth_havekey(KEYNO)); TEST_ASSERT_TRUE(authhavekey(KEYNO)); - - return; } -void -test_HaveKeyIncorrect(void) +void test_HaveKeyIncorrect(void); +void test_HaveKeyIncorrect(void) { const keyid_t KEYNO = 2; TEST_ASSERT_FALSE(auth_havekey(KEYNO)); TEST_ASSERT_FALSE(authhavekey(KEYNO)); - - return; } -void -test_AddWithAuthUseKey(void) +void test_AddWithAuthUseKey(void); +void test_AddWithAuthUseKey(void) { const keyid_t KEYNO = 5; const char* KEY = "52a"; TEST_ASSERT_TRUE(authusekey(KEYNO, KEYTYPE, (const u_char*)KEY)); - - return; } -void -test_EmptyKey(void) +void test_EmptyKey(void); +void test_EmptyKey(void) { const keyid_t KEYNO = 3; const char* KEY = ""; - TEST_ASSERT_FALSE(authusekey(KEYNO, KEYTYPE, (const u_char*)KEY)); - - return; } /* test the implementation of 'auth_log2' -- use a local copy of the code */ @@ -181,12 +157,12 @@ auth_log2( return (u_short)r; } -void -test_auth_log2(void) +void test_auth_log2(void); +void test_auth_log2(void) { int l2; size_t tv; - + TEST_ASSERT_EQUAL_INT(0, auth_log2(0)); TEST_ASSERT_EQUAL_INT(0, auth_log2(1)); for (l2 = 1; l2 < sizeof(size_t)*CHAR_BIT; ++l2) { @@ -196,3 +172,155 @@ test_auth_log2(void) TEST_ASSERT_EQUAL_INT(l2, auth_log2(2*tv - 1)); } } + +/* Converting a string to a host address. Here we use 'getaddrinfo()' in + * an independent implementation to avoid cross-reactions with the + * object under test. 'inet_pton' is too dangerous to handle it + * properly, and ultimate performance is *not* the goal here. + */ +static int/*BOOL*/ +getaddr( + int af, + const char *astr, + sockaddr_u * addr) +{ + struct addrinfo hint; + struct addrinfo *ares; + + memset(&hint, 0, sizeof(hint)); + hint.ai_flags = AI_NUMERICHOST; + hint.ai_family = af; + if (getaddrinfo(astr, NULL, &hint, &ares)) + return FALSE; + if (ares->ai_addrlen > sizeof(*addr)) + memcpy(addr, ares->ai_addr, sizeof(*addr)); + else + memcpy(addr, ares->ai_addr, ares->ai_addrlen); + freeaddrinfo(ares); + return TRUE; +} + +void test_AddrMatch_anull(void); +void test_AddrMatch_anull(void) +{ + /* Check the not-an-address logic with a prefix/check length of + * zero bits. Any compare with a NULL or AF_UNSPEC address + * returns inequality (aka FALSE). + */ + sockaddr_u ip4, ip6, ipn; + + memset(&ipn, 0, sizeof(ipn)); + AF(&ipn) = AF_UNSPEC; + + TEST_ASSERT_TRUE(getaddr(AF_INET , "192.128.1.1", &ip4)); + TEST_ASSERT_TRUE(getaddr(AF_INET6, "::1" , &ip6)); + + TEST_ASSERT_FALSE(keyacc_amatch(NULL, NULL, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(NULL, &ipn, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(NULL, &ip4, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(NULL, &ip6, 0)); + + TEST_ASSERT_FALSE(keyacc_amatch(&ipn, NULL, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ipn, &ipn, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ipn, &ip4, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ipn, &ip6, 0)); + + TEST_ASSERT_FALSE(keyacc_amatch(&ip4, NULL, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ip4, &ipn, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ip6, NULL, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ip6, &ipn, 0)); +} + +void test_AddrMatch_self4(void); +void test_AddrMatch_self4(void) +{ + sockaddr_u ip4; + unsigned int bits; + + TEST_ASSERT_TRUE(getaddr(AF_INET, "192.128.1.1", &ip4)); + for (bits = 0; bits < 40; ++bits) + TEST_ASSERT_TRUE(keyacc_amatch(&ip4, &ip4, bits)); +} + +void test_AddrMatch_self6(void); +void test_AddrMatch_self6(void) +{ + sockaddr_u ip6; + unsigned int bits; + + TEST_ASSERT_TRUE(getaddr(AF_INET6, "::1" , &ip6)); + for (bits = 0; bits < 136; ++bits) + TEST_ASSERT_TRUE(keyacc_amatch(&ip6, &ip6, bits)); +} + +void test_AddrMatch_afmix(void); +void test_AddrMatch_afmix(void) +{ + sockaddr_u ip6, ip4; + + TEST_ASSERT_TRUE(getaddr(AF_INET , "192.128.1.1", &ip4)); + TEST_ASSERT_TRUE(getaddr(AF_INET6, "::1" , &ip6)); + + TEST_ASSERT_FALSE(keyacc_amatch(&ip4, &ip6, 0)); + TEST_ASSERT_FALSE(keyacc_amatch(&ip6, &ip4, 0)); +} + +void test_AddrMatch_ipv4(void); +void test_AddrMatch_ipv4(void) +{ + sockaddr_u a1, a2; + unsigned int bits; + int want; + + TEST_ASSERT_TRUE(getaddr(AF_INET, "192.128.2.1", &a1)); + TEST_ASSERT_TRUE(getaddr(AF_INET, "192.128.3.1", &a2)); + + /* the first 23 bits are equal, so any prefix <= 23 should match */ + for (bits = 0; bits < 40; ++bits) { + snprintf(msgbuf, sizeof(msgbuf), + "keyacc_amatch(*,*,%u) wrong", bits); + want = (bits <= 23); + TEST_ASSERT_EQUAL_MESSAGE(want, keyacc_amatch(&a1, &a2, bits), msgbuf); + } + + TEST_ASSERT_TRUE(getaddr(AF_INET, "192.128.2.127", &a1)); + TEST_ASSERT_TRUE(getaddr(AF_INET, "192.128.2.128", &a2)); + + /* the first 24 bits are equal, so any prefix <= 24 should match */ + for (bits = 0; bits < 40; ++bits) { + snprintf(msgbuf, sizeof(msgbuf), + "keyacc_amatch(*,*,%u) wrong", bits); + want = (bits <= 24); + TEST_ASSERT_EQUAL_MESSAGE(want, keyacc_amatch(&a1, &a2, bits), msgbuf); + } +} + +void test_AddrMatch_ipv6(void); +void test_AddrMatch_ipv6(void) +{ + sockaddr_u a1, a2; + unsigned int bits; + int want; + + TEST_ASSERT_TRUE(getaddr(AF_INET6, "FEDC:BA98:7654:3210::2:FFFF", &a1)); + TEST_ASSERT_TRUE(getaddr(AF_INET6, "FEDC:BA98:7654:3210::3:FFFF", &a2)); + + /* the first 111 bits are equal, so any prefix <= 111 should match */ + for (bits = 0; bits < 136; ++bits) { + snprintf(msgbuf, sizeof(msgbuf), + "keyacc_amatch(*,*,%u) wrong", bits); + want = (bits <= 111); + TEST_ASSERT_EQUAL_MESSAGE(want, keyacc_amatch(&a1, &a2, bits), msgbuf); + } + + TEST_ASSERT_TRUE(getaddr(AF_INET6, "FEDC:BA98:7654:3210::2:7FFF", &a1)); + TEST_ASSERT_TRUE(getaddr(AF_INET6, "FEDC:BA98:7654:3210::2:8000", &a2)); + + /* the first 112 bits are equal, so any prefix <= 112 should match */ + for (bits = 0; bits < 136; ++bits) { + snprintf(msgbuf, sizeof(msgbuf), + "keyacc_amatch(*,*,%u) wrong", bits); + want = (bits <= 112); + TEST_ASSERT_EQUAL_MESSAGE(want, keyacc_amatch(&a1, &a2, bits), msgbuf); + } +} diff --git a/tests/libntp/run-a_md5encrypt.c b/tests/libntp/run-a_md5encrypt.c index a4bfa36dc9288..332f0e2d1cfda 100644 --- a/tests/libntp/run-a_md5encrypt.c +++ b/tests/libntp/run-a_md5encrypt.c @@ -36,6 +36,13 @@ extern void test_IPv4AddressToRefId(void); extern void test_IPv6AddressToRefId(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -51,6 +58,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("a_md5encrypt.c"); RUN_TEST(test_Encrypt, 40); RUN_TEST(test_DecryptValid, 41); diff --git a/tests/libntp/run-atoint.c b/tests/libntp/run-atoint.c index e8405fd7dd19a..9212c81cb5a5f 100644 --- a/tests/libntp/run-atoint.c +++ b/tests/libntp/run-atoint.c @@ -37,6 +37,13 @@ extern void test_PositiveOverflowBig(void); extern void test_IllegalCharacter(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("atoint.c"); RUN_TEST(test_RegularPositive, 7); RUN_TEST(test_RegularNegative, 8); diff --git a/tests/libntp/run-atouint.c b/tests/libntp/run-atouint.c index b7c17320a2a52..9597a7658048e 100644 --- a/tests/libntp/run-atouint.c +++ b/tests/libntp/run-atouint.c @@ -37,6 +37,13 @@ extern void test_Negative(void); extern void test_IllegalChar(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("atouint.c"); RUN_TEST(test_RegularPositive, 9); RUN_TEST(test_PositiveOverflowBoundary, 10); diff --git a/tests/libntp/run-authkeys.c b/tests/libntp/run-authkeys.c index cc91876a8735f..bdf48f0e15299 100644 --- a/tests/libntp/run-authkeys.c +++ b/tests/libntp/run-authkeys.c @@ -38,8 +38,21 @@ extern void test_HaveKeyIncorrect(void); extern void test_AddWithAuthUseKey(void); extern void test_EmptyKey(void); extern void test_auth_log2(void); +extern void test_AddrMatch_anull(void); +extern void test_AddrMatch_self4(void); +extern void test_AddrMatch_self6(void); +extern void test_AddrMatch_afmix(void); +extern void test_AddrMatch_ipv4(void); +extern void test_AddrMatch_ipv6(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -55,14 +68,21 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("authkeys.c"); - RUN_TEST(test_AddTrustedKeys, 25); - RUN_TEST(test_AddUntrustedKey, 26); - RUN_TEST(test_HaveKeyCorrect, 27); - RUN_TEST(test_HaveKeyIncorrect, 28); - RUN_TEST(test_AddWithAuthUseKey, 29); - RUN_TEST(test_EmptyKey, 30); - RUN_TEST(test_auth_log2, 31); + RUN_TEST(test_AddTrustedKeys, 79); + RUN_TEST(test_AddUntrustedKey, 92); + RUN_TEST(test_HaveKeyCorrect, 102); + RUN_TEST(test_HaveKeyIncorrect, 113); + RUN_TEST(test_AddWithAuthUseKey, 122); + RUN_TEST(test_EmptyKey, 131); + RUN_TEST(test_auth_log2, 160); + RUN_TEST(test_AddrMatch_anull, 203); + RUN_TEST(test_AddrMatch_self4, 234); + RUN_TEST(test_AddrMatch_self6, 245); + RUN_TEST(test_AddrMatch_afmix, 256); + RUN_TEST(test_AddrMatch_ipv4, 268); + RUN_TEST(test_AddrMatch_ipv6, 298); return (UnityEnd()); } diff --git a/tests/libntp/run-buftvtots.c b/tests/libntp/run-buftvtots.c index 82a19698ef005..c8d68a36808cb 100644 --- a/tests/libntp/run-buftvtots.c +++ b/tests/libntp/run-buftvtots.c @@ -38,6 +38,13 @@ extern void test_IllegalMicroseconds(void); extern void test_AlwaysFalseOnWindows(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -53,6 +60,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("buftvtots.c"); RUN_TEST(test_ZeroBuffer, 14); RUN_TEST(test_IntegerAndFractionalBuffer, 15); diff --git a/tests/libntp/run-calendar.c b/tests/libntp/run-calendar.c index 82309bd3b8f71..393b36898223d 100644 --- a/tests/libntp/run-calendar.c +++ b/tests/libntp/run-calendar.c @@ -50,6 +50,13 @@ extern void test_NtpToNtp(void); extern void test_NtpToTime(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -65,6 +72,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("calendar.c"); RUN_TEST(test_DaySplitMerge, 24); RUN_TEST(test_SplitYearDays1, 25); diff --git a/tests/libntp/run-caljulian.c b/tests/libntp/run-caljulian.c index a11389cbd7f93..f611dde2884e8 100644 --- a/tests/libntp/run-caljulian.c +++ b/tests/libntp/run-caljulian.c @@ -37,6 +37,13 @@ extern void test_uLongBoundary(void); extern void test_uLongWrapped(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("caljulian.c"); RUN_TEST(test_RegularTime, 16); RUN_TEST(test_LeapYear, 17); diff --git a/tests/libntp/run-caltontp.c b/tests/libntp/run-caltontp.c index c80e0a4a70e42..b6d043f676e06 100644 --- a/tests/libntp/run-caltontp.c +++ b/tests/libntp/run-caltontp.c @@ -34,6 +34,13 @@ extern void test_DateLeapYear(void); extern void test_WraparoundDateIn2036(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("caltontp.c"); RUN_TEST(test_DateGivenMonthDay, 5); RUN_TEST(test_DateGivenYearDay, 6); diff --git a/tests/libntp/run-calyearstart.c b/tests/libntp/run-calyearstart.c index 374e9d5eb143f..68909169a96bd 100644 --- a/tests/libntp/run-calyearstart.c +++ b/tests/libntp/run-calyearstart.c @@ -35,6 +35,13 @@ extern void test_NoWrapInDateRangeLeapYear(void); extern void test_WrapInDateRange(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -50,6 +57,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("calyearstart.c"); RUN_TEST(test_NoWrapInDateRange, 11); RUN_TEST(test_NoWrapInDateRangeLeapYear, 12); diff --git a/tests/libntp/run-clocktime.c b/tests/libntp/run-clocktime.c index 8d19831f64941..a729cb4879edd 100644 --- a/tests/libntp/run-clocktime.c +++ b/tests/libntp/run-clocktime.c @@ -40,6 +40,13 @@ extern void test_NoReasonableConversion(void); extern void test_AlwaysInLimit(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -55,6 +62,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("clocktime.c"); RUN_TEST(test_CurrentYear, 11); RUN_TEST(test_CurrentYearFuzz, 12); diff --git a/tests/libntp/run-decodenetnum.c b/tests/libntp/run-decodenetnum.c index d41f93eb4f3da..aef1fdaa24d1e 100644 --- a/tests/libntp/run-decodenetnum.c +++ b/tests/libntp/run-decodenetnum.c @@ -37,6 +37,13 @@ extern void test_IllegalAddress(void); extern void test_IllegalCharInPort(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("decodenetnum.c"); RUN_TEST(test_IPv4AddressOnly, 8); RUN_TEST(test_IPv4AddressWithPort, 9); diff --git a/tests/libntp/run-hextoint.c b/tests/libntp/run-hextoint.c index 66cc57dcd5c05..70f000eb686b5 100644 --- a/tests/libntp/run-hextoint.c +++ b/tests/libntp/run-hextoint.c @@ -37,6 +37,13 @@ extern void test_Overflow(void); extern void test_IllegalChar(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("hextoint.c"); RUN_TEST(test_SingleDigit, 9); RUN_TEST(test_MultipleDigits, 10); diff --git a/tests/libntp/run-hextolfp.c b/tests/libntp/run-hextolfp.c index e894c3bbe3a6c..258d9b172e12c 100644 --- a/tests/libntp/run-hextolfp.c +++ b/tests/libntp/run-hextolfp.c @@ -38,6 +38,13 @@ extern void test_IllegalNumberOfInteger(void); extern void test_IllegalChar(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -53,6 +60,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("hextolfp.c"); RUN_TEST(test_PositiveInteger, 9); RUN_TEST(test_NegativeInteger, 10); diff --git a/tests/libntp/run-humandate.c b/tests/libntp/run-humandate.c index 690895fddf40e..109292ecf1eb3 100644 --- a/tests/libntp/run-humandate.c +++ b/tests/libntp/run-humandate.c @@ -33,6 +33,13 @@ extern void test_RegularTime(void); extern void test_CurrentTime(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -48,6 +55,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("humandate.c"); RUN_TEST(test_RegularTime, 9); RUN_TEST(test_CurrentTime, 10); diff --git a/tests/libntp/run-lfpfunc.c b/tests/libntp/run-lfpfunc.c index 5c7f658fa93ba..40d004f249036 100644 --- a/tests/libntp/run-lfpfunc.c +++ b/tests/libntp/run-lfpfunc.c @@ -42,6 +42,13 @@ extern void test_SignedRelOps(void); extern void test_UnsignedRelOps(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -57,6 +64,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("lfpfunc.c"); RUN_TEST(test_AdditionLR, 48); RUN_TEST(test_AdditionRL, 49); diff --git a/tests/libntp/run-lfptostr.c b/tests/libntp/run-lfptostr.c index fbdeb7a1d549a..2ee7b0055a000 100644 --- a/tests/libntp/run-lfptostr.c +++ b/tests/libntp/run-lfptostr.c @@ -42,6 +42,13 @@ extern void test_MillisecondsRoundingDown(void); extern void test_UnsignedInteger(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -57,6 +64,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("lfptostr.c"); RUN_TEST(test_PositiveInteger, 24); RUN_TEST(test_NegativeInteger, 25); diff --git a/tests/libntp/run-modetoa.c b/tests/libntp/run-modetoa.c index 0c1558e6d9db3..6d561340d8516 100644 --- a/tests/libntp/run-modetoa.c +++ b/tests/libntp/run-modetoa.c @@ -32,6 +32,13 @@ extern void test_KnownMode(void); extern void test_UnknownMode(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -47,6 +54,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("modetoa.c"); RUN_TEST(test_KnownMode, 8); RUN_TEST(test_UnknownMode, 9); diff --git a/tests/libntp/run-msyslog.c b/tests/libntp/run-msyslog.c index ff264f833fc81..0ebeb4562a60e 100644 --- a/tests/libntp/run-msyslog.c +++ b/tests/libntp/run-msyslog.c @@ -38,6 +38,13 @@ extern void test_msnprintfNullTarget(void); extern void test_msnprintfTruncate(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -53,6 +60,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("msyslog.c"); RUN_TEST(test_msnprintf, 14); RUN_TEST(test_msnprintfLiteralPercentm, 15); diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c index 9301b84b3fc0d..c41630bc77d26 100644 --- a/tests/libntp/run-netof.c +++ b/tests/libntp/run-netof.c @@ -36,6 +36,13 @@ extern void test_ClassAAddress(void); extern void test_IPv6Address(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -51,6 +58,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("netof.c"); RUN_TEST(test_ClassBAddress, 12); RUN_TEST(test_ClassCAddress, 13); diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c index f3368a7210fa9..8b0ab79714029 100644 --- a/tests/libntp/run-numtoa.c +++ b/tests/libntp/run-numtoa.c @@ -33,6 +33,13 @@ extern void test_Address(void); extern void test_Netmask(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -48,6 +55,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("numtoa.c"); RUN_TEST(test_Address, 9); RUN_TEST(test_Netmask, 10); diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c index 49b52640bb514..4e49ccb02e80e 100644 --- a/tests/libntp/run-numtohost.c +++ b/tests/libntp/run-numtohost.c @@ -32,6 +32,13 @@ extern void tearDown(void); extern void test_LoopbackNetNonResolve(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -47,6 +54,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("numtohost.c"); RUN_TEST(test_LoopbackNetNonResolve, 9); diff --git a/tests/libntp/run-octtoint.c b/tests/libntp/run-octtoint.c index 9d2990401d84e..3002763656fb9 100644 --- a/tests/libntp/run-octtoint.c +++ b/tests/libntp/run-octtoint.c @@ -37,6 +37,13 @@ extern void test_IllegalCharacter(void); extern void test_IllegalDigit(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("octtoint.c"); RUN_TEST(test_SingleDigit, 8); RUN_TEST(test_MultipleDigits, 9); diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c index e034cc2af7fd9..e5e7e09a21628 100644 --- a/tests/libntp/run-prettydate.c +++ b/tests/libntp/run-prettydate.c @@ -33,6 +33,13 @@ extern void tearDown(void); extern void test_ConstantDate(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -48,6 +55,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("prettydate.c"); RUN_TEST(test_ConstantDate, 10); diff --git a/tests/libntp/run-recvbuff.c b/tests/libntp/run-recvbuff.c index b8a3796638f14..926a5a946900d 100644 --- a/tests/libntp/run-recvbuff.c +++ b/tests/libntp/run-recvbuff.c @@ -33,6 +33,13 @@ extern void test_GetAndFree(void); extern void test_GetAndFill(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -48,6 +55,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("recvbuff.c"); RUN_TEST(test_Initialization, 8); RUN_TEST(test_GetAndFree, 9); diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c index 465690f763051..1c9e1dc7f3293 100644 --- a/tests/libntp/run-refidsmear.c +++ b/tests/libntp/run-refidsmear.c @@ -34,6 +34,13 @@ extern void tearDown(void); extern void test_refidsmear(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("refidsmear.c"); RUN_TEST(test_refidsmear, 36); diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c index d829580b0ce38..5383d3aad5634 100644 --- a/tests/libntp/run-refnumtoa.c +++ b/tests/libntp/run-refnumtoa.c @@ -33,6 +33,13 @@ extern void test_LocalClock(void); extern void test_UnknownId(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -48,6 +55,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("refnumtoa.c"); RUN_TEST(test_LocalClock, 13); RUN_TEST(test_UnknownId, 14); diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c index 1dba912d5c1fa..53eba8d6b1505 100644 --- a/tests/libntp/run-sfptostr.c +++ b/tests/libntp/run-sfptostr.c @@ -39,6 +39,13 @@ extern void test_SingleDecimalInteger(void); extern void test_SingleDecimalRounding(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -54,6 +61,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("sfptostr.c"); RUN_TEST(test_PositiveInteger, 13); RUN_TEST(test_NegativeInteger, 14); diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c index bde07ed60a6a8..b409f20c964e0 100644 --- a/tests/libntp/run-socktoa.c +++ b/tests/libntp/run-socktoa.c @@ -38,6 +38,13 @@ extern void test_HashEqual(void); extern void test_HashNotEqual(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -53,6 +60,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("socktoa.c"); RUN_TEST(test_IPv4AddressWithPort, 11); RUN_TEST(test_IPv6AddressWithPort, 12); diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c index cef9a36fbaa60..fcb4a9d1999d6 100644 --- a/tests/libntp/run-ssl_init.c +++ b/tests/libntp/run-ssl_init.c @@ -31,10 +31,19 @@ extern void tearDown(void); extern void test_MD5KeyTypeWithoutDigestLength(void); extern void test_MD5KeyTypeWithDigestLength(void); extern void test_SHA1KeyTypeWithDigestLength(void); +extern void test_CMACKeyTypeWithDigestLength(void); extern void test_MD5KeyName(void); extern void test_SHA1KeyName(void); +extern void test_CMACKeyName(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -50,12 +59,15 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ssl_init.c"); - RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 17); - RUN_TEST(test_MD5KeyTypeWithDigestLength, 18); - RUN_TEST(test_SHA1KeyTypeWithDigestLength, 19); - RUN_TEST(test_MD5KeyName, 20); - RUN_TEST(test_SHA1KeyName, 21); + RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 20); + RUN_TEST(test_MD5KeyTypeWithDigestLength, 21); + RUN_TEST(test_SHA1KeyTypeWithDigestLength, 22); + RUN_TEST(test_CMACKeyTypeWithDigestLength, 23); + RUN_TEST(test_MD5KeyName, 24); + RUN_TEST(test_SHA1KeyName, 25); + RUN_TEST(test_CMACKeyName, 26); return (UnityEnd()); } diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c index f0f93861ec9b4..b1902e1e411aa 100644 --- a/tests/libntp/run-statestr.c +++ b/tests/libntp/run-statestr.c @@ -36,6 +36,13 @@ extern void test_ClockCodeExists(void); extern void test_ClockCodeUnknown(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -51,6 +58,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("statestr.c"); RUN_TEST(test_PeerRestart, 10); RUN_TEST(test_SysUnspecified, 11); diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c index 404f57f115a66..07f27c27775e8 100644 --- a/tests/libntp/run-strtolfp.c +++ b/tests/libntp/run-strtolfp.c @@ -39,6 +39,13 @@ extern void test_NegativeMsFraction(void); extern void test_InvalidChars(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -54,6 +61,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("strtolfp.c"); RUN_TEST(test_PositiveInteger, 12); RUN_TEST(test_NegativeInteger, 13); diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c index badc84a9bce23..76bad9415da5b 100644 --- a/tests/libntp/run-timespecops.c +++ b/tests/libntp/run-timespecops.c @@ -62,6 +62,13 @@ extern void test_LFProundtrip(void); extern void test_ToString(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -77,6 +84,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("timespecops.c"); RUN_TEST(test_Helpers1, 37); RUN_TEST(test_Normalise, 38); diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c index 69fead53cb528..cadfa6c5aded2 100644 --- a/tests/libntp/run-timevalops.c +++ b/tests/libntp/run-timevalops.c @@ -61,6 +61,13 @@ extern void test_LFProundtrip(void); extern void test_ToString(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -76,6 +83,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("timevalops.c"); RUN_TEST(test_Helpers1, 37); RUN_TEST(test_Normalise, 38); diff --git a/tests/libntp/run-tsafememcmp.c b/tests/libntp/run-tsafememcmp.c index 1bcfc9cda3644..7f40e2bea00c4 100644 --- a/tests/libntp/run-tsafememcmp.c +++ b/tests/libntp/run-tsafememcmp.c @@ -37,6 +37,13 @@ extern void test_MiddleByte(void); extern void test_MiddleByteUpLo(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -52,6 +59,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("tsafememcmp.c"); RUN_TEST(test_Empty, 10); RUN_TEST(test_Equal, 11); diff --git a/tests/libntp/run-tstotv.c b/tests/libntp/run-tstotv.c index c060f771222fa..17f879e4d19d7 100644 --- a/tests/libntp/run-tstotv.c +++ b/tests/libntp/run-tstotv.c @@ -34,6 +34,13 @@ extern void test_MicrosecondsExact(void); extern void test_MicrosecondsRounding(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("tstotv.c"); RUN_TEST(test_Seconds, 8); RUN_TEST(test_MicrosecondsExact, 9); diff --git a/tests/libntp/run-tvtots.c b/tests/libntp/run-tvtots.c index 3ed734eca1ac7..c31768885245a 100644 --- a/tests/libntp/run-tvtots.c +++ b/tests/libntp/run-tvtots.c @@ -35,6 +35,13 @@ extern void test_MicrosecondsRounded(void); extern void test_MicrosecondsExact(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -50,6 +57,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("tvtots.c"); RUN_TEST(test_Seconds, 10); RUN_TEST(test_MicrosecondsRounded, 11); diff --git a/tests/libntp/run-uglydate.c b/tests/libntp/run-uglydate.c index 5667b7062f670..5cc04bda622a0 100644 --- a/tests/libntp/run-uglydate.c +++ b/tests/libntp/run-uglydate.c @@ -32,6 +32,13 @@ extern void tearDown(void); extern void test_ConstantDateTime(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -47,6 +54,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("uglydate.c"); RUN_TEST(test_ConstantDateTime, 9); diff --git a/tests/libntp/run-vi64ops.c b/tests/libntp/run-vi64ops.c index 599a4b78d727e..b5cafc7f650b8 100644 --- a/tests/libntp/run-vi64ops.c +++ b/tests/libntp/run-vi64ops.c @@ -34,6 +34,13 @@ extern void test_ParseVUI64_neg(void); extern void test_ParseVUI64_case(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("vi64ops.c"); RUN_TEST(test_ParseVUI64_pos, 10); RUN_TEST(test_ParseVUI64_neg, 11); diff --git a/tests/libntp/run-ymd2yd.c b/tests/libntp/run-ymd2yd.c index 4669ce9b504ae..3200632a8aed8 100644 --- a/tests/libntp/run-ymd2yd.c +++ b/tests/libntp/run-ymd2yd.c @@ -34,6 +34,13 @@ extern void test_LeapYearFebruary(void); extern void test_LeapYearDecember(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ymd2yd.c"); RUN_TEST(test_NonLeapYearFebruary, 7); RUN_TEST(test_NonLeapYearJune, 8); diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c index 435e5c912fd60..9a59a9b42548e 100644 --- a/tests/libntp/ssl_init.c +++ b/tests/libntp/ssl_init.c @@ -6,6 +6,8 @@ # include "openssl/err.h" # include "openssl/rand.h" # include "openssl/evp.h" + +#define CMAC "AES128CMAC" #endif #include "unity.h" @@ -13,12 +15,15 @@ static const size_t TEST_MD5_DIGEST_LENGTH = 16; static const size_t TEST_SHA1_DIGEST_LENGTH = 20; +static const size_t TEST_CMAC_DIGEST_LENGTH = 16; void test_MD5KeyTypeWithoutDigestLength(void); void test_MD5KeyTypeWithDigestLength(void); void test_SHA1KeyTypeWithDigestLength(void); +void test_CMACKeyTypeWithDigestLength(void); void test_MD5KeyName(void); void test_SHA1KeyName(void); +void test_CMACKeyName(void); // keytype_from_text() @@ -52,6 +57,21 @@ test_SHA1KeyTypeWithDigestLength(void) { } +void +test_CMACKeyTypeWithDigestLength(void) { +#ifdef OPENSSL + size_t digestLength; + size_t expected = TEST_CMAC_DIGEST_LENGTH; + + TEST_ASSERT_EQUAL(NID_cmac, keytype_from_text(CMAC, &digestLength)); + TEST_ASSERT_EQUAL(expected, digestLength); + /* OPENSSL */ +#else + TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined"); +#endif +} + + // keytype_name() void test_MD5KeyName(void) { @@ -67,3 +87,14 @@ test_SHA1KeyName(void) { TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined"); #endif /* OPENSSL */ } + + +void +test_CMACKeyName(void) { +#ifdef OPENSSL + TEST_ASSERT_EQUAL_STRING(CMAC, keytype_name(NID_cmac)); +#else + TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined"); +#endif /* OPENSSL */ +} + diff --git a/tests/libntp/testconf.yml b/tests/libntp/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/libntp/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + diff --git a/tests/libntp/timespecops.c b/tests/libntp/timespecops.c index 741b1adfe782f..01617da0a28a0 100644 --- a/tests/libntp/timespecops.c +++ b/tests/libntp/timespecops.c @@ -132,7 +132,8 @@ AssertFpClose(const l_fp m, const l_fp n, const l_fp limit) return TRUE; } else { - printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n", lfptoa(&m, 10), lfptoa(&n, 10), lfptoa(&diff, 10)); + printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n", + lfptoa(&m, 10), lfptoa(&n, 10), lfptoa(&diff, 10)); return FALSE; } } @@ -147,11 +148,13 @@ AssertTimespecClose(const struct timespec m, const struct timespec n, diff = abs_tspec(sub_tspec(m, n)); if (cmp_tspec(limit, diff) >= 0) return TRUE; - else - { - printf("m_expr which is %ld.%lu \nand\nn_expr which is %ld.%lu\nare not close; diff=%ld.%lunsec\n", m.tv_sec, m.tv_nsec, n.tv_sec, n.tv_nsec, diff.tv_sec, diff.tv_nsec); - return FALSE; - } + + printf("m_expr which is %lld.%09lu \nand\n" + "n_expr which is %lld.%09lu\nare not close; diff=%lld.%09lunsec\n", + (long long)m.tv_sec, m.tv_nsec, + (long long)n.tv_sec, n.tv_nsec, + (long long)diff.tv_sec, diff.tv_nsec); + return FALSE; } //----------------------------------------------- diff --git a/tests/libntp/timevalops.c b/tests/libntp/timevalops.c index 20d589299228b..0c498ca396b6a 100644 --- a/tests/libntp/timevalops.c +++ b/tests/libntp/timevalops.c @@ -116,13 +116,13 @@ AssertTimevalClose(const struct timeval m, const struct timeval n, const struct diff = abs_tval(sub_tval(m, n)); if (cmp_tval(limit, diff) >= 0) return TRUE; - else - { - printf("m_expr which is %ld.%lu \nand\nn_expr which is %ld.%lu\nare not close; diff=%ld.%luusec\n", m.tv_sec, m.tv_usec, n.tv_sec, n.tv_usec, diff.tv_sec, diff.tv_usec); - //I don't have variables m_expr and n_expr in unity, those are command line arguments which only getst has!!! - return FALSE; - } + printf("m_expr which is %lld.%06lu \nand\n" + "n_expr which is %lld.%06lu\nare not close; diff=%lld.%06luusec\n", + (long long)m.tv_sec, m.tv_usec, + (long long)n.tv_sec, n.tv_usec, + (long long)diff.tv_sec, diff.tv_usec); + return FALSE; } @@ -142,8 +142,8 @@ AssertFpClose(const l_fp m, const l_fp n, const l_fp limit) return TRUE; } else { - printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n", lfptoa(&m, 10), lfptoa(&n, 10), lfptoa(&diff, 10)); - //printf("m_expr which is %d.%d \nand\nn_expr which is %d.%d\nare not close; diff=%d.%dusec\n", m.l_uf, m.Ul_i, n.l_uf, n.Ul_i, diff.l_uf, diff.Ul_i); + printf("m_expr which is %s \nand\nn_expr which is %s\nare not close; diff=%susec\n", + lfptoa(&m, 10), lfptoa(&n, 10), lfptoa(&diff, 10)); return FALSE; } } diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am index 02ac1a166ab30..35ebcde334e8e 100644 --- a/tests/ntpd/Makefile.am +++ b/tests/ntpd/Makefile.am @@ -2,11 +2,16 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) + +EXTRA_DIST = \ + testconf.yml \ + $(NULL) check_PROGRAMS = \ test-leapsec \ @@ -71,7 +76,8 @@ BUILT_SOURCES += \ ### -test_leapsec_CFLAGS = \ +test_leapsec_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -87,10 +93,11 @@ test_leapsec_SOURCES = \ $(NULL) $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list) - $(run_unity) leapsec.c run-leapsec.c + $(run_unity) $< $@ ### test_ntp_prio_q_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -106,11 +113,12 @@ test_ntp_prio_q_SOURCES = \ $(NULL) $(srcdir)/run-ntp_prio_q.c: $(srcdir)/ntp_prio_q.c $(std_unity_list) - $(run_unity) ntp_prio_q.c run-ntp_prio_q.c + $(run_unity) $< $@ ### test_ntp_restrict_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -125,12 +133,13 @@ test_ntp_restrict_SOURCES = \ $(NULL) $(srcdir)/run-ntp_restrict.c: $(srcdir)/ntp_restrict.c $(std_unity_list) - $(run_unity) ntp_restrict.c run-ntp_restrict.c + $(run_unity) $< $@ ### test_rc_cmdlength_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -145,7 +154,7 @@ test_rc_cmdlength_SOURCES = \ $(NULL) $(srcdir)/run-rc_cmdlength.c: $(srcdir)/rc_cmdlength.c $(std_unity_list) - $(run_unity) rc_cmdlength.c run-rc_cmdlength.c + $(run_unity) $< $@ ### @@ -162,16 +171,18 @@ test_ntp_signd_SOURCES = \ $(NULL) $(srcdir)/run-t-ntp_signd.c: $(srcdir)/t-ntp_signd.c $(std_unity_list) - $(run_unity) t-ntp_signd.c run-t-ntp_signd.c + $(run_unity) $< $@ ### test_ntp_scanner_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) test_ntp_scanner_LDADD = \ $(unity_tests_LDADD) \ $(top_builddir)/ntpd/ntp_config.o \ + $(top_builddir)/ntpd/ntp_io.o \ $(top_builddir)/ntpd/ntp_parser.o \ $(NULL) @@ -182,7 +193,7 @@ test_ntp_scanner_SOURCES = \ $(NULL) $(srcdir)/run-t-ntp_scanner.c: $(srcdir)/t-ntp_scanner.c $(std_unity_list) - $(run_unity) t-ntp_scanner.c run-t-ntp_scanner.c + $(run_unity) $< $@ TESTS = diff --git a/tests/ntpd/Makefile.in b/tests/ntpd/Makefile.in index 93911512bb04d..39b4c4fbd33a8 100644 --- a/tests/ntpd/Makefile.in +++ b/tests/ntpd/Makefile.in @@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -199,6 +200,7 @@ am_test_ntp_scanner_OBJECTS = \ test_ntp_scanner_OBJECTS = $(am_test_ntp_scanner_OBJECTS) test_ntp_scanner_DEPENDENCIES = $(am__DEPENDENCIES_3) \ $(top_builddir)/ntpd/ntp_config.o \ + $(top_builddir)/ntpd/ntp_io.o \ $(top_builddir)/ntpd/ntp_parser.o $(am__DEPENDENCIES_1) test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -769,10 +771,15 @@ BUILT_SOURCES = $(srcdir)/run-leapsec.c $(srcdir)/run-ntp_prio_q.c \ check-libunity .deps-ver CLEANFILES = check-libntpd check-libntp check-libunity .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb LDADD = \ $(top_builddir)/ntpd/libntpd.a \ $(top_builddir)/libntp/libntp.a \ @@ -796,6 +803,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP) $(NTP_HARD_LDFLAGS) ### test_leapsec_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -814,6 +822,7 @@ test_leapsec_SOURCES = \ ### test_ntp_prio_q_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -831,6 +840,7 @@ test_ntp_prio_q_SOURCES = \ ### test_ntp_restrict_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -847,6 +857,7 @@ test_ntp_restrict_SOURCES = \ ### test_rc_cmdlength_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) @@ -877,12 +888,14 @@ test_ntp_signd_SOURCES = \ ### test_ntp_scanner_CFLAGS = \ + $(AM_CFLAGS) \ -I$(top_srcdir)/sntp/unity \ $(NULL) test_ntp_scanner_LDADD = \ $(unity_tests_LDADD) \ $(top_builddir)/ntpd/ntp_config.o \ + $(top_builddir)/ntpd/ntp_io.o \ $(top_builddir)/ntpd/ntp_parser.o \ $(NULL) @@ -1655,22 +1668,22 @@ uninstall-am: $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list) - $(run_unity) leapsec.c run-leapsec.c + $(run_unity) $< $@ $(srcdir)/run-ntp_prio_q.c: $(srcdir)/ntp_prio_q.c $(std_unity_list) - $(run_unity) ntp_prio_q.c run-ntp_prio_q.c + $(run_unity) $< $@ $(srcdir)/run-ntp_restrict.c: $(srcdir)/ntp_restrict.c $(std_unity_list) - $(run_unity) ntp_restrict.c run-ntp_restrict.c + $(run_unity) $< $@ $(srcdir)/run-rc_cmdlength.c: $(srcdir)/rc_cmdlength.c $(std_unity_list) - $(run_unity) rc_cmdlength.c run-rc_cmdlength.c + $(run_unity) $< $@ $(srcdir)/run-t-ntp_signd.c: $(srcdir)/t-ntp_signd.c $(std_unity_list) - $(run_unity) t-ntp_signd.c run-t-ntp_signd.c + $(run_unity) $< $@ $(srcdir)/run-t-ntp_scanner.c: $(srcdir)/t-ntp_scanner.c $(std_unity_list) - $(run_unity) t-ntp_scanner.c run-t-ntp_scanner.c + $(run_unity) $< $@ check-libntpd: ../../ntpd/libntpd.a @echo stamp > $@ diff --git a/tests/ntpd/leapsec.c b/tests/ntpd/leapsec.c index 36ecd39c802dd..34a6ed76ee6de 100644 --- a/tests/ntpd/leapsec.c +++ b/tests/ntpd/leapsec.c @@ -6,11 +6,15 @@ #include "ntp_calendar.h" #include "ntp_stdlib.h" #include "ntp_leapsec.h" +#include "lib_strbuf.h" #include "unity.h" #include <string.h> +extern void setUp(void); +extern void tearDown(void); + #include "test-libntp.h" static const char leap1 [] = @@ -231,7 +235,7 @@ static const uint32_t lsec2009 = 3439756800u; // +34, 1 Jan 2009, 00:00:00 utc static const uint32_t lsec2012 = 3550089600u; // +35, 1 Jul 2012, 00:00:00 utc static const uint32_t lsec2015 = 3644697600u; // +36, 1 Jul 2015, 00:00:00 utc -int stringreader(void* farg) +static int stringreader(void* farg) { const char ** cpp = (const char**)farg; @@ -266,40 +270,21 @@ setup_clear_table(void) return rc; } - -char * +#if 0 /* formatting & compare currently not used... */ +static const char * CalendarToString(const struct calendar cal) { - char * ss = malloc (sizeof (char) * 100); - char buffer[100] =""; - - *ss = '\0'; - sprintf(buffer, "%u", cal.year); - strcat(ss,buffer); - strcat(ss,"-"); - sprintf(buffer, "%u", (u_int)cal.month); - strcat(ss,buffer); - strcat(ss,"-"); - sprintf(buffer, "%u", (u_int)cal.monthday); - strcat(ss,buffer); - strcat(ss," ("); - sprintf(buffer, "%u", (u_int) cal.yearday); - strcat(ss,buffer); - strcat(ss,") "); - sprintf(buffer, "%u", (u_int)cal.hour); - strcat(ss,buffer); - strcat(ss,":"); - sprintf(buffer, "%u", (u_int)cal.minute); - strcat(ss,buffer); - strcat(ss,":"); - sprintf(buffer, "%u", (u_int)cal.second); - strcat(ss,buffer); - //ss << cal.year << "-" << (u_int)cal.month << "-" << (u_int)cal.monthday << " (" << cal.yearday << ") " << (u_int)cal.hour << ":" << (u_int)cal.minute << ":" << (u_int)cal.second; - return ss; + char * str; + + LIB_GETBUF(str); + snprintf(str, LIB_BUFLENGTH, + "%04hu-%02hhu-%02hhu (%hu) %02hhu:%02hhu:%02hhu", + cal.year, cal.month, cal.monthday, cal.yearday, + cal.hour, cal.minute, cal.second); + return str; } - -int +static int IsEqual(const struct calendar expected, const struct calendar actual) { @@ -312,16 +297,13 @@ IsEqual(const struct calendar expected, const struct calendar actual) && expected.second == actual.second) { return TRUE; } else { - char *p_exp = CalendarToString(expected); - char *p_act = CalendarToString(actual); - + const char *p_exp = CalendarToString(expected); + const char *p_act = CalendarToString(actual); printf("expected: %s but was %s", p_exp, p_act); - - free(p_exp); - free(p_act); return FALSE; } } +#endif /*0*/ //------------------------- @@ -331,15 +313,12 @@ setUp(void) ntpcal_set_timefunc(timefunc); settime(1970, 1, 1, 0, 0, 0); leapsec_ut_pristine(); - - return; } void tearDown(void) { ntpcal_set_timefunc(NULL); - return; } // ===================================================================== @@ -347,73 +326,63 @@ tearDown(void) // ===================================================================== // ---------------------------------------------------------------------- -void -test_ValidateGood(void) +extern void test_ValidateGood(void); +void test_ValidateGood(void) { const char *cp = leap_ghash; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_GOODHASH, rc); - return; } // ---------------------------------------------------------------------- -void -test_ValidateNoHash(void) +extern void test_ValidateNoHash(void); +void test_ValidateNoHash(void) { const char *cp = leap2; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_NOHASH, rc); - return; } // ---------------------------------------------------------------------- -void -test_ValidateBad(void) +extern void test_ValidateBad(void); +void test_ValidateBad(void) { const char *cp = leap_bhash; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_BADHASH, rc); - - return; } // ---------------------------------------------------------------------- -void -test_ValidateMalformed(void) +extern void test_ValidateMalformed(void); +void test_ValidateMalformed(void) { const char *cp = leap_mhash; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_BADFORMAT, rc); - - return; } // ---------------------------------------------------------------------- -void -test_ValidateMalformedShort(void) +extern void test_ValidateMalformedShort(void); +void test_ValidateMalformedShort(void) { const char *cp = leap_shash; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_BADFORMAT, rc); - - return; } // ---------------------------------------------------------------------- -void -test_ValidateNoLeadZero(void) +extern void test_ValidateNoLeadZero(void); +void test_ValidateNoLeadZero(void) { const char *cp = leap_gthash; int rc = leapsec_validate(stringreader, &cp); TEST_ASSERT_EQUAL(LSVALID_GOODHASH, rc); - - return; } // ===================================================================== @@ -422,10 +391,10 @@ test_ValidateNoLeadZero(void) // ---------------------------------------------------------------------- // test table selection -void -test_tableSelect(void) +extern void test_tableSelect(void); +void test_tableSelect(void) { - leap_table_t *pt1, *pt2, *pt3, *pt4; + leap_table_t *pt1, *pt2, *pt3; pt1 = leapsec_get_table(0); pt2 = leapsec_get_table(0); @@ -455,15 +424,12 @@ test_tableSelect(void) pt3 = leapsec_get_table(1); TEST_ASSERT_EQUAL(pt1, pt2); TEST_ASSERT_NOT_EQUAL(pt2, pt3); - - return; } // ---------------------------------------------------------------------- // load file & check expiration - -void -test_loadFileExpire(void) +extern void test_loadFileExpire(void); +void test_loadFileExpire(void) { const char *cp = leap1; int rc; @@ -476,15 +442,12 @@ test_loadFileExpire(void) TEST_ASSERT_EQUAL(0, rc); rc = leapsec_expired(3610569601u, NULL); TEST_ASSERT_EQUAL(1, rc); - - return; } // ---------------------------------------------------------------------- // load file & check time-to-live - -void -test_loadFileTTL(void) +extern void test_loadFileTTL(void); +void test_loadFileTTL(void) { const char *cp = leap1; int rc; @@ -508,8 +471,6 @@ test_loadFileTTL(void) // expired since 1 sec rc = leapsec_daystolive(limit + 1, &pivot); TEST_ASSERT_EQUAL(-1, rc); - - return; } // ===================================================================== @@ -518,8 +479,8 @@ test_loadFileTTL(void) // ---------------------------------------------------------------------- // test query in pristine state (bug#2745 misbehaviour) -void -test_lsQueryPristineState(void) +extern void test_lsQueryPristineState(void); +void test_lsQueryPristineState(void) { int rc; leap_result_t qr; @@ -528,14 +489,12 @@ test_lsQueryPristineState(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // ad-hoc jump: leap second at 2009.01.01 -60days -void -test_ls2009faraway(void) +extern void test_ls2009faraway(void); +void test_ls2009faraway(void) { int rc; leap_result_t qr; @@ -549,14 +508,12 @@ test_ls2009faraway(void) TEST_ASSERT_EQUAL(33, qr.tai_offs); TEST_ASSERT_EQUAL(0, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // ad-hoc jump: leap second at 2009.01.01 -1week -void -test_ls2009weekaway(void) +extern void test_ls2009weekaway(void); +void test_ls2009weekaway(void) { int rc; leap_result_t qr; @@ -570,14 +527,12 @@ test_ls2009weekaway(void) TEST_ASSERT_EQUAL(33, qr.tai_offs); TEST_ASSERT_EQUAL(1, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_SCHEDULE, qr.proximity); - - return; } // ---------------------------------------------------------------------- // ad-hoc jump: leap second at 2009.01.01 -1hr -void -test_ls2009houraway(void) +extern void test_ls2009houraway(void); +void test_ls2009houraway(void) { int rc; leap_result_t qr; @@ -591,14 +546,12 @@ test_ls2009houraway(void) TEST_ASSERT_EQUAL(33, qr.tai_offs); TEST_ASSERT_EQUAL(1, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_ANNOUNCE, qr.proximity); - - return; } // ---------------------------------------------------------------------- // ad-hoc jump: leap second at 2009.01.01 -1sec -void -test_ls2009secaway(void) +extern void test_ls2009secaway(void); +void test_ls2009secaway(void) { int rc; leap_result_t qr; @@ -612,14 +565,12 @@ test_ls2009secaway(void) TEST_ASSERT_EQUAL(33, qr.tai_offs); TEST_ASSERT_EQUAL(1, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_ALERT, qr.proximity); - - return; } // ---------------------------------------------------------------------- // ad-hoc jump to leap second at 2009.01.01 -void -test_ls2009onspot(void) +extern void test_ls2009onspot(void); +void test_ls2009onspot(void) { int rc; leap_result_t qr; @@ -633,14 +584,12 @@ test_ls2009onspot(void) TEST_ASSERT_EQUAL(34, qr.tai_offs); TEST_ASSERT_EQUAL(0, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // test handling of the leap second at 2009.01.01 without table -void -test_ls2009nodata(void) +extern void test_ls2009nodata(void); +void test_ls2009nodata(void) { int rc; leap_result_t qr; @@ -654,14 +603,12 @@ test_ls2009nodata(void) TEST_ASSERT_EQUAL(0, qr.tai_offs); TEST_ASSERT_EQUAL(0, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // test handling of the leap second at 2009.01.01 with culled data -void -test_ls2009limdata(void) +extern void test_ls2009limdata(void); +void test_ls2009limdata(void) { int rc; leap_result_t qr; @@ -679,18 +626,15 @@ test_ls2009limdata(void) TEST_ASSERT_TRUE(35 >= qr.tai_offs); TEST_ASSERT_EQUAL(0, qr.tai_diff); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // Far-distance forward jump into a transiton window. -void -test_qryJumpFarAhead(void) +extern void test_qryJumpFarAhead(void); +void test_qryJumpFarAhead(void) { - int rc; - leap_result_t qr; - int last, idx; + int rc; + leap_result_t qr; int mode; for (mode=0; mode < 2; ++mode) { @@ -709,10 +653,11 @@ test_qryJumpFarAhead(void) // ---------------------------------------------------------------------- // Forward jump into the next transition window -void test_qryJumpAheadToTransition(void) { +extern void test_qryJumpAheadToTransition(void); +void test_qryJumpAheadToTransition(void) +{ int rc; leap_result_t qr; - int last, idx; int mode; for (mode=0; mode < 2; ++mode) { @@ -727,18 +672,15 @@ void test_qryJumpAheadToTransition(void) { rc = leapsec_query(&qr, lsec2009+1, NULL); TEST_ASSERT_EQUAL(TRUE, rc); } - - return; } // ---------------------------------------------------------------------- // Forward jump over the next transition window -void -test_qryJumpAheadOverTransition(void) +extern void test_qryJumpAheadOverTransition(void); +void test_qryJumpAheadOverTransition(void) { int rc; leap_result_t qr; - int last, idx; int mode; for (mode=0; mode < 2; ++mode) { @@ -753,8 +695,6 @@ test_qryJumpAheadOverTransition(void) rc = leapsec_query(&qr, lsec2009+5, NULL); TEST_ASSERT_EQUAL(FALSE, rc); } - - return; } // ===================================================================== @@ -763,11 +703,10 @@ test_qryJumpAheadOverTransition(void) // ---------------------------------------------------------------------- // add dynamic leap second (like from peer/clock) -void -test_addDynamic(void) +extern void test_addDynamic(void); +void test_addDynamic(void) { int rc; - leap_result_t qr; static const uint32_t insns[] = { 2982009600u, // 29 # 1 Jul 1994 @@ -794,15 +733,13 @@ test_addDynamic(void) TEST_ASSERT_EQUAL(FALSE, rc); //leap_table_t * pt = leapsec_get_table(0); //leapsec_dump(pt, (leapsec_dumper)fprintf, stdout); - - return; } // ---------------------------------------------------------------------- // add fixed leap seconds (like from network packet) #if 0 /* currently unused -- possibly revived later */ -void -FAILtest_addFixed(void) +extern void no_test_addFixed(void); +void no_test_addFixed(void) { int rc; leap_result_t qr; @@ -849,16 +786,14 @@ FAILtest_addFixed(void) TEST_ASSERT_EQUAL(FALSE, rc); //leap_table_t * pt = leapsec_get_table(0); //leapsec_dump(pt, (leapsec_dumper)fprintf, stdout); - - return; } #endif // ---------------------------------------------------------------------- // add fixed leap seconds (like from network packet) #if 0 /* currently unused -- possibly revived later */ -void -FAILtest_addFixedExtend(void) +extern void no_test_addFixedExtend(void); +void no_test_addFixedExtend(void) { int rc; leap_result_t qr; @@ -900,8 +835,6 @@ FAILtest_addFixedExtend(void) TEST_ASSERT_EQUAL(FALSE, rc); //leap_table_t * pt = leapsec_get_table(FALSE); //leapsec_dump(pt, (leapsec_dumper)fprintf, stdout); - - return; } #endif @@ -910,8 +843,8 @@ FAILtest_addFixedExtend(void) // empty table and test queries before / between /after the tabulated // values. #if 0 /* currently unused -- possibly revived later */ -void -FAILtest_setFixedExtend(void) +extern void no_test_setFixedExtend(void); +void no_test_setFixedExtend(void) { int rc; leap_result_t qr; @@ -947,8 +880,6 @@ FAILtest_setFixedExtend(void) //leap_table_t * pt = leapsec_get_table(0); //leapsec_dump(pt, (leapsec_dumper)fprintf, stdout); - - return; } #endif @@ -958,7 +889,9 @@ FAILtest_setFixedExtend(void) // ---------------------------------------------------------------------- // Check if the offset can be applied to an empty table ONCE -void test_taiEmptyTable(void) { +extern void test_taiEmptyTable(void); +void test_taiEmptyTable(void) +{ int rc; rc = leapsec_autokey_tai(35, lsec2015-30*86400, NULL); @@ -970,8 +903,8 @@ void test_taiEmptyTable(void) { // ---------------------------------------------------------------------- // Check that with fixed entries the operation fails -void -test_taiTableFixed(void) +extern void test_taiTableFixed(void); +void test_taiTableFixed(void) { int rc; @@ -980,14 +913,12 @@ test_taiTableFixed(void) rc = leapsec_autokey_tai(35, lsec2015-30*86400, NULL); TEST_ASSERT_EQUAL(FALSE, rc); - - return; } // ---------------------------------------------------------------------- // test adjustment with a dynamic entry already there -void -test_taiTableDynamic(void) +extern void test_taiTableDynamic(void); +void test_taiTableDynamic(void) { int rc; leap_era_t era; @@ -1010,14 +941,12 @@ test_taiTableDynamic(void) TEST_ASSERT_EQUAL(35, era.taiof); leapsec_query_era(&era, lsec2015+10, NULL); TEST_ASSERT_EQUAL(36, era.taiof); - - return; } // ---------------------------------------------------------------------- // test adjustment with a dynamic entry already there in dead zone -void -test_taiTableDynamicDeadZone(void) +extern void test_taiTableDynamicDeadZone(void); +void test_taiTableDynamicDeadZone(void) { int rc; @@ -1029,8 +958,6 @@ test_taiTableDynamicDeadZone(void) rc = leapsec_autokey_tai(35, lsec2015+5, NULL); TEST_ASSERT_EQUAL(FALSE, rc); - - return; } @@ -1040,8 +967,8 @@ test_taiTableDynamicDeadZone(void) // ---------------------------------------------------------------------- // leap second insert at 2009.01.01, electric mode -void -test_ls2009seqInsElectric(void) +extern void test_ls2009seqInsElectric(void); +void test_ls2009seqInsElectric(void) { int rc; leap_result_t qr; @@ -1081,14 +1008,12 @@ test_ls2009seqInsElectric(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // leap second insert at 2009.01.01, dumb mode -void -test_ls2009seqInsDumb(void) +extern void test_ls2009seqInsDumb(void); +void test_ls2009seqInsDumb(void) { int rc; leap_result_t qr; @@ -1132,15 +1057,12 @@ test_ls2009seqInsDumb(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } - // ---------------------------------------------------------------------- // fake leap second remove at 2009.01.01, electric mode -void -test_ls2009seqDelElectric(void) +extern void test_ls2009seqDelElectric(void); +void test_ls2009seqDelElectric(void) { int rc; leap_result_t qr; @@ -1180,14 +1102,12 @@ test_ls2009seqDelElectric(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // fake leap second remove at 2009.01.01. dumb mode -void -test_ls2009seqDelDumb(void) +extern void test_ls2009seqDelDumb(void); +void test_ls2009seqDelDumb(void) { int rc; leap_result_t qr; @@ -1226,14 +1146,12 @@ test_ls2009seqDelDumb(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // leap second insert at 2012.07.01, electric mode -void -test_ls2012seqInsElectric(void) +extern void test_ls2012seqInsElectric(void); +void test_ls2012seqInsElectric(void) { int rc; leap_result_t qr; @@ -1273,14 +1191,12 @@ test_ls2012seqInsElectric(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // leap second insert at 2012.07.01, dumb mode -void -test_ls2012seqInsDumb(void) +extern void test_ls2012seqInsDumb(void); +void test_ls2012seqInsDumb(void) { int rc; leap_result_t qr; @@ -1326,23 +1242,17 @@ test_ls2012seqInsDumb(void) TEST_ASSERT_EQUAL(FALSE, rc); TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); - - return; } // ---------------------------------------------------------------------- // test repeated query on empty table in dumb mode -void -test_lsEmptyTableDumb(void) +extern void test_lsEmptyTableDumb(void); +void test_lsEmptyTableDumb(void) { int rc; leap_result_t qr; - //const - time_t pivot; - pivot = lsec2012; - // const - //time_t pivot(lsec2012); + const time_t pivot = lsec2012; const uint32_t t0 = lsec2012 - 10; const uint32_t tE = lsec2012 + 10; @@ -1355,14 +1265,12 @@ test_lsEmptyTableDumb(void) TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); } - - return; } // ---------------------------------------------------------------------- // test repeated query on empty table in electric mode -void -test_lsEmptyTableElectric(void) +extern void test_lsEmptyTableElectric(void); +void test_lsEmptyTableElectric(void) { int rc; leap_result_t qr; @@ -1370,9 +1278,7 @@ test_lsEmptyTableElectric(void) leapsec_electric(1); TEST_ASSERT_EQUAL(1, leapsec_electric(-1)); - //const - time_t pivot;//(lsec2012); - pivot = lsec2012; + const time_t pivot = lsec2012; const uint32_t t0 = lsec2012 - 10; const uint32_t tE = lsec2012 + 10; @@ -1383,6 +1289,4 @@ test_lsEmptyTableElectric(void) TEST_ASSERT_EQUAL(0, qr.warped ); TEST_ASSERT_EQUAL(LSPROX_NOWARN, qr.proximity); } - - return; } diff --git a/tests/ntpd/ntp_prio_q.c b/tests/ntpd/ntp_prio_q.c index 4b27157a9fa5f..7741af82f3ff7 100644 --- a/tests/ntpd/ntp_prio_q.c +++ b/tests/ntpd/ntp_prio_q.c @@ -27,23 +27,25 @@ typedef struct Element } element; -int +static int/*BOOL*/ compare_elements(const void * e1, const void * e2) { - return ((element*)e1)->number < ((element*)e2)->number; + return ((const element*)e1)->number < ((const element*)e2)->number; } /* tests */ -void -test_AllocateDeallocateNode(void) { +extern void test_AllocateDeallocateNode(void); +void test_AllocateDeallocateNode(void) +{ element* e_ptr = debug_get_node(sizeof(element)); free_node(e_ptr); } -void -test_EmptyQueue(void) { +extern void test_EmptyQueue(void); +void test_EmptyQueue(void) +{ queue* q = create_queue(); TEST_ASSERT_NOT_NULL(q); @@ -56,8 +58,9 @@ test_EmptyQueue(void) { } -void -test_OneElementQueue(void) { +extern void test_OneElementQueue(void); +void test_OneElementQueue(void) +{ queue* q = create_queue(); TEST_ASSERT_NOT_NULL(q); @@ -84,8 +87,9 @@ test_OneElementQueue(void) { } -void -test_MultipleElementQueue(void) { +extern void test_MultipleElementQueue(void); +void test_MultipleElementQueue(void) +{ queue* q = create_queue(); TEST_ASSERT_NOT_NULL(q); @@ -122,8 +126,9 @@ test_MultipleElementQueue(void) { } -void -test_CustomOrderQueue(void) { +extern void test_CustomOrderQueue(void); +void test_CustomOrderQueue(void) +{ queue* q = debug_create_priority_queue(compare_elements); element *e1_ptr, *e2_ptr, *e3_ptr, *e4_ptr, *e5_ptr, *e6_ptr; @@ -179,8 +184,9 @@ test_CustomOrderQueue(void) { } -void -test_DestroyNonEmptyQueue(void) { +extern void test_DestroyNonEmptyQueue(void); +void test_DestroyNonEmptyQueue(void) +{ queue* q = create_queue(); element *e1_ptr, *e2_ptr, *e3_ptr, *e4_ptr, *e5_ptr, *e6_ptr; @@ -201,8 +207,10 @@ test_DestroyNonEmptyQueue(void) { destroy_queue(q); } -void -test_AppendQueues(void) { + +extern void test_AppendQueues(void); +void test_AppendQueues(void) +{ queue* q1 = create_queue(); queue* q2 = create_queue(); queue* q3 = create_queue(); diff --git a/tests/ntpd/ntp_restrict.c b/tests/ntpd/ntp_restrict.c index 08d236e24df92..d86a279a4f33d 100644 --- a/tests/ntpd/ntp_restrict.c +++ b/tests/ntpd/ntp_restrict.c @@ -5,10 +5,14 @@ #include "unity.h" +extern void setUp(void); +extern void tearDown(void); + /* Helper functions */ -sockaddr_u -create_sockaddr_u(short sin_family, unsigned short sin_port, char* ip_addr) { +static sockaddr_u +create_sockaddr_u(short sin_family, unsigned short sin_port, char* ip_addr) +{ sockaddr_u sockaddr; sockaddr.sa4.sin_family = AF_INET; @@ -20,14 +24,14 @@ create_sockaddr_u(short sin_family, unsigned short sin_port, char* ip_addr) { } -void -setUp(void) { +void setUp(void) +{ init_restrict(); } -void -tearDown(void) { +void tearDown(void) +{ restrict_u *empty_restrict = malloc(sizeof(restrict_u)); memset(empty_restrict, 0, sizeof(restrict_u)); @@ -56,8 +60,9 @@ tearDown(void) { /* Tests */ -void -test_RestrictionsAreEmptyAfterInit(void) { +extern void test_RestrictionsAreEmptyAfterInit(void); +void test_RestrictionsAreEmptyAfterInit(void) +{ restrict_u *rl4 = malloc(sizeof(restrict_u)); restrict_u *rl6 = malloc(sizeof(restrict_u)); @@ -66,14 +71,14 @@ test_RestrictionsAreEmptyAfterInit(void) { memset(rl6, 0, sizeof(restrict_u)); TEST_ASSERT_EQUAL(rl4->count, restrictlist4->count); - TEST_ASSERT_EQUAL(rl4->flags, restrictlist4->flags); + TEST_ASSERT_EQUAL(rl4->rflags, restrictlist4->rflags); TEST_ASSERT_EQUAL(rl4->mflags, restrictlist4->mflags); TEST_ASSERT_EQUAL(rl4->expire, restrictlist4->expire); TEST_ASSERT_EQUAL(rl4->u.v4.addr, restrictlist4->u.v4.addr); TEST_ASSERT_EQUAL(rl4->u.v4.mask, restrictlist4->u.v4.mask); TEST_ASSERT_EQUAL(rl6->count, restrictlist6->count); - TEST_ASSERT_EQUAL(rl6->flags, restrictlist6->flags); + TEST_ASSERT_EQUAL(rl6->rflags, restrictlist6->rflags); TEST_ASSERT_EQUAL(rl6->mflags, restrictlist6->mflags); TEST_ASSERT_EQUAL(rl6->expire, restrictlist6->expire); @@ -82,66 +87,78 @@ test_RestrictionsAreEmptyAfterInit(void) { } -void -test_ReturnsCorrectDefaultRestrictions(void) { +extern void test_ReturnsCorrectDefaultRestrictions(void); +void test_ReturnsCorrectDefaultRestrictions(void) +{ sockaddr_u sockaddr = create_sockaddr_u(AF_INET, 54321, "63.161.169.137"); + r4addr r4a; - u_short retval = restrictions(&sockaddr); + restrictions(&sockaddr, &r4a); - TEST_ASSERT_EQUAL(0, retval); + TEST_ASSERT_EQUAL(0, r4a.rflags); } -void -test_HackingDefaultRestriction(void) { +extern void test_HackingDefaultRestriction(void); +void test_HackingDefaultRestriction(void) +{ /* * We change the flag of the default restriction, * and check if restriction() returns that flag */ - const u_short flags = 42; + const u_short rflags = 42; + r4addr r4a; sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "0.0.0.0"); sockaddr_u resmask = create_sockaddr_u(AF_INET, 54321, "0.0.0.0"); - hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, 0, flags, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, -1, 0, rflags, 0); sockaddr_u sockaddr = create_sockaddr_u(AF_INET, 54321, "111.123.251.124"); - TEST_ASSERT_EQUAL(flags, restrictions(&sockaddr)); + restrictions(&sockaddr, &r4a); + TEST_ASSERT_EQUAL(rflags, r4a.rflags); } -void -test_CantRemoveDefaultEntry(void) { +extern void test_CantRemoveDefaultEntry(void); +void test_CantRemoveDefaultEntry(void) +{ sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "0.0.0.0"); sockaddr_u resmask = create_sockaddr_u(AF_INET, 54321, "0.0.0.0"); + r4addr r4a; - hack_restrict(RESTRICT_REMOVE, &resaddr, &resmask, 0, 0, 0); + hack_restrict(RESTRICT_REMOVE, &resaddr, &resmask, -1, 0, 0, 0); - TEST_ASSERT_EQUAL(0, restrictions(&resaddr)); + restrictions(&resaddr, &r4a); + TEST_ASSERT_EQUAL(0, r4a.rflags); } -void -test_AddingNewRestriction(void) { +extern void test_AddingNewRestriction(void); +void test_AddingNewRestriction(void) +{ sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); sockaddr_u resmask = create_sockaddr_u(AF_INET, 54321, "128.0.0.0"); + r4addr r4a; - const u_short flags = 42; + const u_short rflags = 42; - hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, 0, flags, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, -1, 0, rflags, 0); - TEST_ASSERT_EQUAL(flags, restrictions(&resaddr)); + restrictions(&resaddr, &r4a); + TEST_ASSERT_EQUAL(rflags, r4a.rflags); } -void -test_TheMostFittingRestrictionIsMatched(void) { +extern void test_TheMostFittingRestrictionIsMatched(void); +void test_TheMostFittingRestrictionIsMatched(void) +{ sockaddr_u resaddr_target = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); sockaddr_u resaddr_not_matching = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); @@ -153,17 +170,20 @@ test_TheMostFittingRestrictionIsMatched(void) { /* it also matches, but we prefer the one above, as it's more specific */ sockaddr_u resaddr_second_match = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); sockaddr_u resmask_second_match = create_sockaddr_u(AF_INET, 54321, "255.0.0.0"); + r4addr r4a; - hack_restrict(RESTRICT_FLAGS, &resaddr_not_matching, &resmask_not_matching, 0, 11, 0); - hack_restrict(RESTRICT_FLAGS, &resaddr_best_match, &resmask_best_match, 0, 22, 0); - hack_restrict(RESTRICT_FLAGS, &resaddr_second_match, &resmask_second_match, 0, 128, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_not_matching, &resmask_not_matching, -1, 0, 11, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_best_match, &resmask_best_match, -1, 0, 22, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_second_match, &resmask_second_match, -1, 0, 128, 0); - TEST_ASSERT_EQUAL(22, restrictions(&resaddr_target)); + restrictions(&resaddr_target, &r4a); + TEST_ASSERT_EQUAL(22, r4a.rflags); } -void -test_DeletedRestrictionIsNotMatched(void) { +extern void test_DeletedRestrictionIsNotMatched(void); +void test_DeletedRestrictionIsNotMatched(void) +{ sockaddr_u resaddr_target = create_sockaddr_u(AF_INET, 54321, "11.22.33.44"); sockaddr_u resaddr_not_matching = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); @@ -174,26 +194,31 @@ test_DeletedRestrictionIsNotMatched(void) { sockaddr_u resaddr_second_match = create_sockaddr_u(AF_INET, 54321, "11.99.33.44"); sockaddr_u resmask_second_match = create_sockaddr_u(AF_INET, 54321, "255.0.0.0"); + r4addr r4a; - hack_restrict(RESTRICT_FLAGS, &resaddr_not_matching, &resmask_not_matching, 0, 11, 0); - hack_restrict(RESTRICT_FLAGS, &resaddr_best_match, &resmask_best_match, 0, 22, 0); - hack_restrict(RESTRICT_FLAGS, &resaddr_second_match, &resmask_second_match, 0, 128, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_not_matching, &resmask_not_matching, -1, 0, 11, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_best_match, &resmask_best_match, -1, 0, 22, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr_second_match, &resmask_second_match, -1, 0, 128, 0); /* deleting the best match*/ - hack_restrict(RESTRICT_REMOVE, &resaddr_best_match, &resmask_best_match, 0, 22, 0); + hack_restrict(RESTRICT_REMOVE, &resaddr_best_match, &resmask_best_match, -1, 0, 22, 0); - TEST_ASSERT_EQUAL(128, restrictions(&resaddr_target)); + restrictions(&resaddr_target, &r4a); + TEST_ASSERT_EQUAL(128, r4a.rflags); } -void -test_RestrictUnflagWorks(void) { +extern void test_RestrictUnflagWorks(void); +void test_RestrictUnflagWorks(void) +{ sockaddr_u resaddr = create_sockaddr_u(AF_INET, 54321, "11.22.30.20"); sockaddr_u resmask = create_sockaddr_u(AF_INET, 54321, "255.255.0.0"); + r4addr r4a; - hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, 0, 11, 0); + hack_restrict(RESTRICT_FLAGS, &resaddr, &resmask, -1, 0, 11, 0); - hack_restrict(RESTRICT_UNFLAG, &resaddr, &resmask, 0, 10, 0); + hack_restrict(RESTRICT_UNFLAG, &resaddr, &resmask, -1, 0, 10, 0); - TEST_ASSERT_EQUAL(1, restrictions(&resaddr)); + restrictions(&resaddr, &r4a); + TEST_ASSERT_EQUAL(1, r4a.rflags); } diff --git a/tests/ntpd/rc_cmdlength.c b/tests/ntpd/rc_cmdlength.c index dfe53167b6772..582070cfb47d2 100644 --- a/tests/ntpd/rc_cmdlength.c +++ b/tests/ntpd/rc_cmdlength.c @@ -11,9 +11,9 @@ #include "test-libntp.h" - -void -test_EvaluateCommandLength(void){ +extern void test_EvaluateCommandLength(void); +void test_EvaluateCommandLength(void) +{ size_t length, commandLength; const char *command1 = "Random Command"; const char *command2 = "Random Command\t\t\n\t"; @@ -35,5 +35,4 @@ test_EvaluateCommandLength(void){ length = strlen(command4); commandLength = remoteconfig_cmdlength(command4, command4+length); TEST_ASSERT_EQUAL(16, commandLength ); - } diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c index 03b633e1ef25e..16b4c3fdac345 100644 --- a/tests/ntpd/run-leapsec.c +++ b/tests/ntpd/run-leapsec.c @@ -27,6 +27,7 @@ #include "ntp_calendar.h" #include "ntp_stdlib.h" #include "ntp_leapsec.h" +#include "lib_strbuf.h" #include "test-libntp.h" #include <string.h> @@ -68,6 +69,13 @@ extern void test_lsEmptyTableDumb(void); extern void test_lsEmptyTableElectric(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -83,40 +91,41 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("leapsec.c"); - RUN_TEST(test_ValidateGood, 351); - RUN_TEST(test_ValidateNoHash, 362); - RUN_TEST(test_ValidateBad, 373); - RUN_TEST(test_ValidateMalformed, 385); - RUN_TEST(test_ValidateMalformedShort, 397); - RUN_TEST(test_ValidateNoLeadZero, 409); - RUN_TEST(test_tableSelect, 426); - RUN_TEST(test_loadFileExpire, 466); - RUN_TEST(test_loadFileTTL, 487); - RUN_TEST(test_lsQueryPristineState, 522); - RUN_TEST(test_ls2009faraway, 538); - RUN_TEST(test_ls2009weekaway, 559); - RUN_TEST(test_ls2009houraway, 580); - RUN_TEST(test_ls2009secaway, 601); - RUN_TEST(test_ls2009onspot, 622); - RUN_TEST(test_ls2009nodata, 643); - RUN_TEST(test_ls2009limdata, 664); - RUN_TEST(test_qryJumpFarAhead, 689); - RUN_TEST(test_qryJumpAheadToTransition, 712); - RUN_TEST(test_qryJumpAheadOverTransition, 737); - RUN_TEST(test_addDynamic, 767); - RUN_TEST(test_taiEmptyTable, 961); - RUN_TEST(test_taiTableFixed, 974); - RUN_TEST(test_taiTableDynamic, 990); - RUN_TEST(test_taiTableDynamicDeadZone, 1020); - RUN_TEST(test_ls2009seqInsElectric, 1044); - RUN_TEST(test_ls2009seqInsDumb, 1091); - RUN_TEST(test_ls2009seqDelElectric, 1143); - RUN_TEST(test_ls2009seqDelDumb, 1190); - RUN_TEST(test_ls2012seqInsElectric, 1236); - RUN_TEST(test_ls2012seqInsDumb, 1283); - RUN_TEST(test_lsEmptyTableDumb, 1336); - RUN_TEST(test_lsEmptyTableElectric, 1365); + RUN_TEST(test_ValidateGood, 329); + RUN_TEST(test_ValidateNoHash, 339); + RUN_TEST(test_ValidateBad, 349); + RUN_TEST(test_ValidateMalformed, 359); + RUN_TEST(test_ValidateMalformedShort, 369); + RUN_TEST(test_ValidateNoLeadZero, 379); + RUN_TEST(test_tableSelect, 394); + RUN_TEST(test_loadFileExpire, 431); + RUN_TEST(test_loadFileTTL, 449); + RUN_TEST(test_lsQueryPristineState, 482); + RUN_TEST(test_ls2009faraway, 496); + RUN_TEST(test_ls2009weekaway, 515); + RUN_TEST(test_ls2009houraway, 534); + RUN_TEST(test_ls2009secaway, 553); + RUN_TEST(test_ls2009onspot, 572); + RUN_TEST(test_ls2009nodata, 591); + RUN_TEST(test_ls2009limdata, 610); + RUN_TEST(test_qryJumpFarAhead, 633); + RUN_TEST(test_qryJumpAheadToTransition, 656); + RUN_TEST(test_qryJumpAheadOverTransition, 679); + RUN_TEST(test_addDynamic, 706); + RUN_TEST(test_taiEmptyTable, 892); + RUN_TEST(test_taiTableFixed, 906); + RUN_TEST(test_taiTableDynamic, 920); + RUN_TEST(test_taiTableDynamicDeadZone, 948); + RUN_TEST(test_ls2009seqInsElectric, 970); + RUN_TEST(test_ls2009seqInsDumb, 1015); + RUN_TEST(test_ls2009seqDelElectric, 1064); + RUN_TEST(test_ls2009seqDelDumb, 1109); + RUN_TEST(test_ls2012seqInsElectric, 1153); + RUN_TEST(test_ls2012seqInsDumb, 1198); + RUN_TEST(test_lsEmptyTableDumb, 1249); + RUN_TEST(test_lsEmptyTableElectric, 1272); return (UnityEnd()); } diff --git a/tests/ntpd/run-ntp_prio_q.c b/tests/ntpd/run-ntp_prio_q.c index 35af443de58e2..5b1adea4aacef 100644 --- a/tests/ntpd/run-ntp_prio_q.c +++ b/tests/ntpd/run-ntp_prio_q.c @@ -41,6 +41,13 @@ extern void test_DestroyNonEmptyQueue(void); extern void test_AppendQueues(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -56,14 +63,15 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ntp_prio_q.c"); - RUN_TEST(test_AllocateDeallocateNode, 39); + RUN_TEST(test_AllocateDeallocateNode, 38); RUN_TEST(test_EmptyQueue, 46); - RUN_TEST(test_OneElementQueue, 60); - RUN_TEST(test_MultipleElementQueue, 88); - RUN_TEST(test_CustomOrderQueue, 126); - RUN_TEST(test_DestroyNonEmptyQueue, 183); - RUN_TEST(test_AppendQueues, 205); + RUN_TEST(test_OneElementQueue, 61); + RUN_TEST(test_MultipleElementQueue, 90); + RUN_TEST(test_CustomOrderQueue, 129); + RUN_TEST(test_DestroyNonEmptyQueue, 187); + RUN_TEST(test_AppendQueues, 211); return (UnityEnd()); } diff --git a/tests/ntpd/run-ntp_restrict.c b/tests/ntpd/run-ntp_restrict.c index d88446207afe5..3303640f1145c 100644 --- a/tests/ntpd/run-ntp_restrict.c +++ b/tests/ntpd/run-ntp_restrict.c @@ -39,6 +39,13 @@ extern void test_DeletedRestrictionIsNotMatched(void); extern void test_RestrictUnflagWorks(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -54,15 +61,16 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ntp_restrict.c"); - RUN_TEST(test_RestrictionsAreEmptyAfterInit, 60); - RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 86); - RUN_TEST(test_HackingDefaultRestriction, 97); - RUN_TEST(test_CantRemoveDefaultEntry, 120); - RUN_TEST(test_AddingNewRestriction, 131); - RUN_TEST(test_TheMostFittingRestrictionIsMatched, 144); - RUN_TEST(test_DeletedRestrictionIsNotMatched, 166); - RUN_TEST(test_RestrictUnflagWorks, 190); + RUN_TEST(test_RestrictionsAreEmptyAfterInit, 63); + RUN_TEST(test_ReturnsCorrectDefaultRestrictions, 90); + RUN_TEST(test_HackingDefaultRestriction, 103); + RUN_TEST(test_CantRemoveDefaultEntry, 129); + RUN_TEST(test_AddingNewRestriction, 143); + RUN_TEST(test_TheMostFittingRestrictionIsMatched, 159); + RUN_TEST(test_DeletedRestrictionIsNotMatched, 184); + RUN_TEST(test_RestrictUnflagWorks, 211); return (UnityEnd()); } diff --git a/tests/ntpd/run-rc_cmdlength.c b/tests/ntpd/run-rc_cmdlength.c index 927a45e73a4ad..e5121cd1d6093 100644 --- a/tests/ntpd/run-rc_cmdlength.c +++ b/tests/ntpd/run-rc_cmdlength.c @@ -36,6 +36,13 @@ extern void tearDown(void); extern void test_EvaluateCommandLength(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -51,8 +58,9 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("rc_cmdlength.c"); - RUN_TEST(test_EvaluateCommandLength, 16); + RUN_TEST(test_EvaluateCommandLength, 14); return (UnityEnd()); } diff --git a/tests/ntpd/run-t-ntp_scanner.c b/tests/ntpd/run-t-ntp_scanner.c index 62d3ed3085d06..056bb5bc6e43a 100644 --- a/tests/ntpd/run-t-ntp_scanner.c +++ b/tests/ntpd/run-t-ntp_scanner.c @@ -40,6 +40,13 @@ extern void test_SpecialSymbols(void); extern void test_EOC(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -55,18 +62,19 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("t-ntp_scanner.c"); - RUN_TEST(test_keywordIncorrectToken, 21); - RUN_TEST(test_keywordServerToken, 22); - RUN_TEST(test_DropUninitializedStack, 23); - RUN_TEST(test_IncorrectlyInitializeLexStack, 24); - RUN_TEST(test_InitializeLexStack, 25); - RUN_TEST(test_PopEmptyStack, 61); - RUN_TEST(test_IsInteger, 69); - RUN_TEST(test_IsUint, 87); - RUN_TEST(test_IsDouble, 99); - RUN_TEST(test_SpecialSymbols, 111); - RUN_TEST(test_EOC, 120); + RUN_TEST(test_keywordIncorrectToken, 8); + RUN_TEST(test_keywordServerToken, 16); + RUN_TEST(test_DropUninitializedStack, 24); + RUN_TEST(test_IncorrectlyInitializeLexStack, 30); + RUN_TEST(test_InitializeLexStack, 38); + RUN_TEST(test_PopEmptyStack, 49); + RUN_TEST(test_IsInteger, 57); + RUN_TEST(test_IsUint, 76); + RUN_TEST(test_IsDouble, 90); + RUN_TEST(test_SpecialSymbols, 104); + RUN_TEST(test_EOC, 115); return (UnityEnd()); } diff --git a/tests/ntpd/run-t-ntp_signd.c b/tests/ntpd/run-t-ntp_signd.c index 5226f7f853120..644b6cee8706f 100644 --- a/tests/ntpd/run-t-ntp_signd.c +++ b/tests/ntpd/run-t-ntp_signd.c @@ -39,6 +39,13 @@ extern void test_recv_packet(void); extern void test_send_via_ntp_signd(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -54,6 +61,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("t-ntp_signd.c"); RUN_TEST(test_connect_incorrect_socket, 67); RUN_TEST(test_connect_correct_socket, 68); diff --git a/tests/ntpd/t-ntp_scanner.c b/tests/ntpd/t-ntp_scanner.c index 862a2ee2bbae3..470449b06c221 100644 --- a/tests/ntpd/t-ntp_scanner.c +++ b/tests/ntpd/t-ntp_scanner.c @@ -2,71 +2,61 @@ #include "unity.h" -//#include <stdio.h> -//#include <ctype.h> -//#include <stdlib.h> -//#include <errno.h> -//#include <string.h> - -//#include "ntpd.h" -//#include "ntp_config.h" -//#include "ntpsim.h" -//#include "ntp_scanner.h" -//#include "ntp_parser.h" - #include "ntp_scanner.c" /* ntp_keyword.h declares finite state machine and token text */ -//#include "ntp_keyword.h" - -void test_keywordIncorrectToken(void); -void test_keywordServerToken(void); -void test_DropUninitializedStack(void); -void test_IncorrectlyInitializeLexStack(void); -void test_InitializeLexStack(void); - -void test_keywordIncorrectToken(void){ +extern void test_keywordIncorrectToken(void); +void test_keywordIncorrectToken(void) +{ const char * temp = keyword(999); //printf("%s\n",temp); TEST_ASSERT_EQUAL_STRING("(keyword not found)",temp); } -void test_keywordServerToken(void){ +extern void test_keywordServerToken(void); +void test_keywordServerToken(void) +{ const char * temp = keyword(T_Server); //printf("%s",temp); //143 or 401 ? TEST_ASSERT_EQUAL_STRING("server",temp); } -void test_DropUninitializedStack(void){ +extern void test_DropUninitializedStack(void); +void test_DropUninitializedStack(void) +{ lex_drop_stack(); } -void test_IncorrectlyInitializeLexStack(void){ +extern void test_IncorrectlyInitializeLexStack(void); +void test_IncorrectlyInitializeLexStack(void) +{ TEST_ASSERT_FALSE(lex_init_stack(NULL,NULL)); lex_drop_stack(); } -void test_InitializeLexStack(void){ +extern void test_InitializeLexStack(void); +void test_InitializeLexStack(void) +{ //Some sort of server is required for this to work. - sockaddr_u * remote_addr; char origin[128] ={ "" } ; strcat(origin,"127.0.0.1"); - //snprintf(origin, sizeof(origin), "remote config from %s", stoa(remote_addr)); TEST_ASSERT_TRUE(lex_init_stack(origin,NULL)); //path, mode -> NULL is ok! lex_drop_stack(); } -void test_PopEmptyStack(void){ +extern void test_PopEmptyStack(void); +void test_PopEmptyStack(void) +{ int temp = lex_pop_file(); TEST_ASSERT_FALSE(temp); } - - -void test_IsInteger(void){ //boolean +extern void test_IsInteger(void); +void test_IsInteger(void) +{ int temp = is_integer("123"); TEST_ASSERT_TRUE(temp); temp = is_integer("-999"); @@ -81,10 +71,11 @@ void test_IsInteger(void){ //boolean TEST_ASSERT_TRUE(temp); temp = is_integer("2347483647"); //too big for signed int TEST_ASSERT_FALSE(temp); - } -void test_IsUint(void){ +extern void test_IsUint(void); +void test_IsUint(void) +{ int temp; temp = is_u_int("-123"); TEST_ASSERT_FALSE(temp); @@ -96,7 +87,9 @@ void test_IsUint(void){ TEST_ASSERT_TRUE(temp); } -void test_IsDouble(void){ +extern void test_IsDouble(void); +void test_IsDouble(void) +{ int temp; temp = is_double("0"); TEST_ASSERT_TRUE(temp); @@ -108,7 +101,9 @@ void test_IsDouble(void){ TEST_ASSERT_TRUE(temp); } -void test_SpecialSymbols(void){ +extern void test_SpecialSymbols(void); +void test_SpecialSymbols(void) +{ int temp ; temp = is_special('a'); TEST_ASSERT_FALSE(temp); @@ -117,7 +112,9 @@ void test_SpecialSymbols(void){ } -void test_EOC(void){ +extern void test_EOC(void); +void test_EOC(void) +{ int temp; if(old_config_style){ temp = is_EOC('\n'); @@ -131,6 +128,5 @@ void test_EOC(void){ TEST_ASSERT_FALSE(temp); temp = is_EOC('1'); TEST_ASSERT_FALSE(temp); - } diff --git a/tests/ntpd/testconf.yml b/tests/ntpd/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/ntpd/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am index 9cd2de94e6fb1..23ca1814b897a 100644 --- a/tests/ntpq/Makefile.am +++ b/tests/ntpq/Makefile.am @@ -2,11 +2,16 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) + +EXTRA_DIST = \ + testconf.yml \ + $(NULL) check_PROGRAMS = \ test-ntpq \ @@ -60,7 +65,7 @@ test_ntpq_SOURCES = \ $(NULL) $(srcdir)/run-t-ntpq.c: $(srcdir)/t-ntpq.c $(std_unity_list) - $(run_unity) t-ntpq.c run-t-ntpq.c + $(run_unity) $< $@ TESTS = diff --git a/tests/ntpq/Makefile.in b/tests/ntpq/Makefile.in index 5241a4bf54234..14645fdcb5db5 100644 --- a/tests/ntpq/Makefile.in +++ b/tests/ntpq/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -699,10 +700,15 @@ BUILT_SOURCES = $(srcdir)/run-t-ntpq.c $(NULL) check-libntpd \ check-libntp check-libunity .deps-ver CLEANFILES = check-libntpd check-libntp check-libunity .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb LDADD = \ $(top_builddir)/ntpq/libntpq.a \ $(top_builddir)/ntpd/libntpd.a \ @@ -1205,7 +1211,7 @@ uninstall-am: $(srcdir)/run-t-ntpq.c: $(srcdir)/t-ntpq.c $(std_unity_list) - $(run_unity) t-ntpq.c run-t-ntpq.c + $(run_unity) $< $@ check-libntpd: ../../ntpd/libntpd.a @echo stamp > $@ diff --git a/tests/ntpq/run-t-ntpq.c b/tests/ntpq/run-t-ntpq.c index ccf2a06c88827..baa1211c44c54 100644 --- a/tests/ntpq/run-t-ntpq.c +++ b/tests/ntpq/run-t-ntpq.c @@ -32,6 +32,13 @@ extern void tearDown(void); extern void testPrimary(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -47,6 +54,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("t-ntpq.c"); RUN_TEST(testPrimary, 20); diff --git a/tests/ntpq/testconf.yml b/tests/ntpq/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/ntpq/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + diff --git a/tests/sandbox/Makefile.am b/tests/sandbox/Makefile.am index 38df52ba15c5b..f89c85868bde2 100644 --- a/tests/sandbox/Makefile.am +++ b/tests/sandbox/Makefile.am @@ -4,11 +4,16 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) + +EXTRA_DIST = \ + testconf.yml \ + $(NULL) check_PROGRAMS = \ first-test \ @@ -27,6 +32,7 @@ LDADD = \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) @@ -51,7 +57,7 @@ bug_2803_SOURCES = \ $(NULL) $(srcdir)/run-ut-2803.c: $(srcdir)/ut-2803.c $(std_unity_list) - $(run_unity) ut-2803.c run-ut-2803.c + $(run_unity) $< $@ BUILT_SOURCES += run-ut-2803.c first_test_SOURCES = \ @@ -60,7 +66,7 @@ first_test_SOURCES = \ $(NULL) $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) - $(run_unity) uglydate.c run-uglydate.c + $(run_unity) $< $@ BUILT_SOURCES += run-uglydate.c second_test_SOURCES = \ @@ -69,7 +75,7 @@ second_test_SOURCES = \ $(NULL) $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) - $(run_unity) modetoa.c run-modetoa.c + $(run_unity) $< $@ BUILT_SOURCES += run-modetoa.c diff --git a/tests/sandbox/Makefile.in b/tests/sandbox/Makefile.in index 7140740338993..b9e496fbed6e8 100644 --- a/tests/sandbox/Makefile.in +++ b/tests/sandbox/Makefile.in @@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -152,7 +153,7 @@ am__DEPENDENCIES_1 = bug_2803_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -164,7 +165,7 @@ first_test_LDADD = $(LDADD) first_test_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_second_test_OBJECTS = modetoa.$(OBJEXT) run-modetoa.$(OBJEXT) \ $(am__objects_1) second_test_OBJECTS = $(am_second_test_OBJECTS) @@ -172,14 +173,14 @@ second_test_LDADD = $(LDADD) second_test_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) smeartest_SOURCES = smeartest.c smeartest_OBJECTS = smeartest.$(OBJEXT) smeartest_LDADD = $(LDADD) smeartest_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -723,10 +724,15 @@ BUILT_SOURCES = run-ut-2803.c run-uglydate.c run-modetoa.c \ check-libntp check-libunity .deps-ver CLEANFILES = check-libntp check-libunity .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb # HMS: we may not need some of these: LDADD = \ @@ -735,6 +741,7 @@ LDADD = \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) @@ -1254,13 +1261,13 @@ uninstall-am: $(srcdir)/run-ut-2803.c: $(srcdir)/ut-2803.c $(std_unity_list) - $(run_unity) ut-2803.c run-ut-2803.c + $(run_unity) $< $@ $(srcdir)/run-uglydate.c: $(srcdir)/uglydate.c $(std_unity_list) - $(run_unity) uglydate.c run-uglydate.c + $(run_unity) $< $@ $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list) - $(run_unity) modetoa.c run-modetoa.c + $(run_unity) $< $@ check-libntp: ../../libntp/libntp.a @echo stamp > $@ diff --git a/tests/sandbox/run-modetoa.c b/tests/sandbox/run-modetoa.c index 143bd756c5fd9..000df89eab2c7 100644 --- a/tests/sandbox/run-modetoa.c +++ b/tests/sandbox/run-modetoa.c @@ -30,6 +30,13 @@ extern void test_KnownMode(void); extern void test_UnknownMode(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -45,6 +52,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("modetoa.c"); RUN_TEST(test_KnownMode, 8); RUN_TEST(test_UnknownMode, 15); diff --git a/tests/sandbox/run-uglydate.c b/tests/sandbox/run-uglydate.c index 5a5a7161d851d..151a3cd27eef0 100644 --- a/tests/sandbox/run-uglydate.c +++ b/tests/sandbox/run-uglydate.c @@ -32,6 +32,13 @@ extern void tearDown(void); extern void test_ConstantDateTime(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -47,6 +54,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("uglydate.c"); RUN_TEST(test_ConstantDateTime, 10); diff --git a/tests/sandbox/run-ut-2803.c b/tests/sandbox/run-ut-2803.c index b948c4a3876bc..afe09049a6391 100644 --- a/tests/sandbox/run-ut-2803.c +++ b/tests/sandbox/run-ut-2803.c @@ -34,6 +34,13 @@ extern void test_main_incorrect(void); extern void test_ignored(void); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -49,6 +56,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("ut-2803.c"); RUN_TEST(test_main, 30); RUN_TEST(test_XPASS, 37); diff --git a/tests/sandbox/testconf.yml b/tests/sandbox/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/sandbox/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + diff --git a/tests/sec-2853/Makefile.am b/tests/sec-2853/Makefile.am index 3f44201a1c66b..4078cf40b8edd 100644 --- a/tests/sec-2853/Makefile.am +++ b/tests/sec-2853/Makefile.am @@ -3,21 +3,28 @@ NULL = BUILT_SOURCES = CLEANFILES = -std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ +std_unity_list = \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +run_unity = ruby $(std_unity_list) + +EXTRA_DIST = \ + testconf.yml \ + $(NULL) check_PROGRAMS = sec-2853 # HMS: we may not need some of these: LDADD = \ - $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/ntpd/rc_cmdlength.o \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) @@ -43,7 +50,7 @@ sec_2853_SOURCES = \ BUILT_SOURCES += $(srcdir)/run-sec-2853.c $(srcdir)/run-sec-2853.c: $(srcdir)/sec-2853.c $(std_unity_list) - $(run_unity) sec-2853.c run-sec-2853.c + $(run_unity) $< $@ # HMS: we may not need some of these: #noinst_HEADERS = ntpdtest.h \ diff --git a/tests/sec-2853/Makefile.in b/tests/sec-2853/Makefile.in index 2fd8a92fa883b..35c180269a5a3 100644 --- a/tests/sec-2853/Makefile.in +++ b/tests/sec-2853/Makefile.in @@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \ $(top_srcdir)/sntp/m4/ltsugar.m4 \ $(top_srcdir)/sntp/m4/ltversion.m4 \ $(top_srcdir)/sntp/m4/lt~obsolete.m4 \ + $(top_srcdir)/sntp/m4/ntp_af_unspec.m4 \ $(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \ $(top_srcdir)/sntp/m4/ntp_compiler.m4 \ $(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \ @@ -143,10 +144,11 @@ am_sec_2853_OBJECTS = run-sec-2853.$(OBJEXT) sec-2853.$(OBJEXT) \ sec_2853_OBJECTS = $(am_sec_2853_OBJECTS) sec_2853_LDADD = $(LDADD) am__DEPENDENCIES_1 = -sec_2853_DEPENDENCIES = $(top_builddir)/sntp/unity/libunity.a \ - $(top_builddir)/ntpd/rc_cmdlength.o $(am__DEPENDENCIES_1) \ +sec_2853_DEPENDENCIES = $(top_builddir)/ntpd/rc_cmdlength.o \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -694,18 +696,25 @@ BUILT_SOURCES = $(srcdir)/run-sec-2853.c check-libntp check-libunity \ check-rc-cmdlength .deps-ver CLEANFILES = check-libntp check-libunity check-rc-cmdlength .deps-ver std_unity_list = \ - $(top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ + $(abs_srcdir)/testconf.yml \ + $(NULL) + +run_unity = ruby $(std_unity_list) +EXTRA_DIST = \ + testconf.yml \ $(NULL) -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb # HMS: we may not need some of these: LDADD = \ - $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/ntpd/rc_cmdlength.o \ + $(top_builddir)/sntp/unity/libunity.a \ + $(top_builddir)/libntp/libntp.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ + $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS) @@ -1193,7 +1202,7 @@ uninstall-am: $(srcdir)/run-sec-2853.c: $(srcdir)/sec-2853.c $(std_unity_list) - $(run_unity) sec-2853.c run-sec-2853.c + $(run_unity) $< $@ check-libntp: ../../libntp/libntp.a @echo stamp > $@ diff --git a/tests/sec-2853/run-sec-2853.c b/tests/sec-2853/run-sec-2853.c index 1159a77c15d5e..d3a0c60c229b9 100644 --- a/tests/sec-2853/run-sec-2853.c +++ b/tests/sec-2853/run-sec-2853.c @@ -31,6 +31,13 @@ extern void tearDown(void); extern void test_main(void ); +//=======Suite Setup===== +static void suite_setup(void) +{ +extern int change_logfile(const char*, int); +change_logfile("stderr", 0); +} + //=======Test Reset Option===== void resetTest(void); void resetTest(void) @@ -46,6 +53,7 @@ char const *progname; int main(int argc, char *argv[]) { progname = argv[0]; + suite_setup(); UnityBegin("sec-2853.c"); RUN_TEST(test_main, 10); diff --git a/tests/sec-2853/testconf.yml b/tests/sec-2853/testconf.yml new file mode 100644 index 0000000000000..6140daaf9c787 --- /dev/null +++ b/tests/sec-2853/testconf.yml @@ -0,0 +1,9 @@ +# configure the test runner generator to properly set up the tests +# - avoid cluttering the syslogs + +--- +:unity: + :suite_setup: + - extern int change_logfile(const char*, int); + - change_logfile("stderr", 0); + |