diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/sntp/tests | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/sntp/tests')
29 files changed, 945 insertions, 1845 deletions
diff --git a/contrib/ntp/sntp/tests/Makefile.am b/contrib/ntp/sntp/tests/Makefile.am index 2228aa0..c5338c7 100644 --- a/contrib/ntp/sntp/tests/Makefile.am +++ b/contrib/ntp/sntp/tests/Makefile.am @@ -1,10 +1,31 @@ NULL = BUILT_SOURCES = -CLEANFILES = kod-output-blank kod-output-single kod-output-multiple debug-output-lfp-dec debug-output-lfp-bin debug-output-pkt -DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple EXTRA_PROGRAMS = -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb +CLEANFILES = \ + debug-output-lfp-bin \ + debug-output-lfp-dec \ + debug-output-pkt \ + kod-output-blank \ + kod-output-multiple \ + kod-output-single \ + testLogfile.log \ + testLogfile2.log \ + $(NULL) + +DISTCLEANFILES = \ + kod-output-blank \ + kod-output-single \ + kod-output-multiple \ + testLogfile.log \ + testLogfile2.log \ + $(NULL) + +std_unity_list = \ + $(srcdir)/../unity/auto/generate_test_runner.rb \ + $(NULL) + +run_unity = cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb # Use EXTRA_PROGRAMS for test files that are under development but # not production-ready @@ -15,50 +36,15 @@ check_PROGRAMS = \ test-keyFile \ test-kodDatabase \ test-kodFile \ + test-log \ test-networking \ test-packetHandling \ test-packetProcessing \ test-utilities \ $(NULL) -if GTEST_AVAILABLE -check_PROGRAMS += tests -else -EXTRA_PROGRAMS += tests -endif - -#if BUILD_SNTP -#check_PROGRAMS += tests -#endif - -base_SOURCES = \ - ../tests_main.cpp \ - $(NULL) - -tests_SOURCES = \ - $(base_SOURCES) \ - g_networking.cpp \ - g_packetHandling.cpp \ - g_packetProcessing.cpp \ - $(NULL) - -# HMS: this test was for the 4.2.6 sntp code. -# g_nameresolution.cpp - -# HMS: Somebody needs to audit the following files to -# make sure all of these tests are now handled by Unity -# -# g_utilities.cpp -# g_kodDatabase.cpp -# g_keyFile.cpp -# g_crypto.cpp -# g_kodFile.cpp - noinst_HEADERS = \ - fileHandlingTest.h \ sntptest.h \ - g_fileHandlingTest.h \ - g_sntptest.h \ $(NULL) dist_check_SCRIPTS = tests-runner @@ -89,33 +75,32 @@ CLEANFILES += \ $(NULL) #split into LDADD and tests_LDADD? -LDADD = \ +base_LDADD = \ ../libsntp.a \ $(LIBOPTS_LDADD) \ $(LDADD_LIBEVENT) \ $(top_builddir)/../libntp/libntp.a \ $(LDADD_LIBNTP) \ $(LDADD_NTP) \ - $(GTEST_LDFLAGS) \ - $(GTEST_LIBS) \ $(NULL) -unity_tests_LDADD = \ - $(LDADD) \ +LDADD = \ + $(base_LDADD) \ $(top_builddir)/unity/libunity.a \ $(LIBM) \ $(NULL) -AM_CFLAGS = $(CFLAGS_NTP) -AM_CXXFLAGS = $(GTEST_CXXFLAGS) +AM_CFLAGS = $(CFLAGS_NTP) AM_CPPFLAGS = $(SNTP_INCS) AM_CPPFLAGS += -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../tests AM_CPPFLAGS += $(LIBOPTS_CFLAGS) AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT) -AM_CPPFLAGS += $(GTEST_CPPFLAGS) AM_CPPFLAGS += $(CPPFLAGS_NTP) +AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H +#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity +AM_CPPFLAGS += -I$(top_srcdir)/unity AM_LDFLAGS = $(LDFLAGS_NTP) @@ -125,73 +110,9 @@ BUILT_SOURCES += \ $(srcdir)/run-kodDatabase.c \ $(srcdir)/run-kodFile.c \ $(srcdir)/run-networking.c \ + $(srcdir)/run-packetHandling.c \ $(srcdir)/run-packetProcessing.c \ $(srcdir)/run-utilities.c \ - $(srcdir)/run-packetHandling.c \ - $(NULL) - -test_keyFile_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_keyFile_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_kodDatabase_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_kodDatabase_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_kodFile_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_kodFile_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_networking_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_networking_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_utilities_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_utilities_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_crypto_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_crypto_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_packetProcessing_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_packetProcessing_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_packetHandling_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_packetHandling_LDADD = \ - $(unity_tests_LDADD) \ $(NULL) test_networking_SOURCES = \ @@ -213,34 +134,48 @@ test_kodDatabase_SOURCES = \ $(NULL) test_keyFile_SOURCES = \ + fileHandlingTest.c \ keyFile.c \ run-keyFile.c \ $(top_builddir)/version.c \ $(NULL) test_kodFile_SOURCES = \ + fileHandlingTest.c \ kodFile.c \ run-kodFile.c \ $(top_builddir)/version.c \ $(NULL) -# ../version.c test_packetProcessing_SOURCES = \ packetProcessing.c \ run-packetProcessing.c \ + sntptest.c \ $(NULL) test_utilities_SOURCES = \ + fileHandlingTest.c \ utilities.c \ run-utilities.c \ $(NULL) +test_crypto_CFLAGS = \ + $(CFLAGS_LIBEVENT) \ + $(AM_CFLAGS) \ + $(NULL) + test_crypto_SOURCES = \ crypto.c \ run-crypto.c \ $(top_builddir)/version.c \ $(NULL) +test_log_SOURCES = \ + t-log.c \ + run-t-log.c \ + $(top_builddir)/version.c \ + $(NULL) + $(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list) $(run_unity) kodFile.c run-kodFile.c @@ -266,6 +201,10 @@ $(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list) $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list) $(run_unity) crypto.c run-crypto.c +$(srcdir)/run-t-log.c: $(srcdir)/t-log.c $(std_unity_list) + $(run_unity) t-log.c run-t-log.c + + #$(srcdir)/../version.c: $(srcdir)/../version.c # gcc -o version.o ../version.c @@ -301,10 +240,10 @@ check-libntp: ../../libntp/libntp.a ../../libntp/libntp.a: cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a -check-libunity: ../sntp/unity/libunity.a +check-libunity: ../unity/libunity.a @echo stamp > $@ -../sntp/unity/libunity.a: +../unity/libunity.a: cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a include $(top_srcdir)/depsver.mf diff --git a/contrib/ntp/sntp/tests/Makefile.in b/contrib/ntp/sntp/tests/Makefile.in index 8cc0ba5..9803fa8 100644 --- a/contrib/ntp/sntp/tests/Makefile.in +++ b/contrib/ntp/sntp/tests/Makefile.in @@ -88,15 +88,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -EXTRA_PROGRAMS = $(am__EXEEXT_1) +EXTRA_PROGRAMS = check_PROGRAMS = test-crypto$(EXEEXT) test-keyFile$(EXEEXT) \ test-kodDatabase$(EXEEXT) test-kodFile$(EXEEXT) \ - test-networking$(EXEEXT) test-packetHandling$(EXEEXT) \ - test-packetProcessing$(EXEEXT) test-utilities$(EXEEXT) \ - $(am__EXEEXT_2) $(am__EXEEXT_3) -@GTEST_AVAILABLE_TRUE@am__append_1 = tests -@GTEST_AVAILABLE_FALSE@am__append_2 = tests -@NTP_CROSSCOMPILE_FALSE@am__append_3 = $(check_PROGRAMS) + test-log$(EXEEXT) test-networking$(EXEEXT) \ + test-packetHandling$(EXEEXT) test-packetProcessing$(EXEEXT) \ + test-utilities$(EXEEXT) $(am__EXEEXT_1) +@NTP_CROSSCOMPILE_FALSE@am__append_1 = $(check_PROGRAMS) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \ @@ -133,24 +131,21 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = fileHandlingTest.h CONFIG_CLEAN_VPATH_FILES = -@GTEST_AVAILABLE_FALSE@am__EXEEXT_1 = tests$(EXEEXT) -am__EXEEXT_2 = -@GTEST_AVAILABLE_TRUE@am__EXEEXT_3 = tests$(EXEEXT) +am__EXEEXT_1 = am__objects_1 = am_test_crypto_OBJECTS = test_crypto-crypto.$(OBJEXT) \ test_crypto-run-crypto.$(OBJEXT) test_crypto-version.$(OBJEXT) \ $(am__objects_1) test_crypto_OBJECTS = $(am_test_crypto_OBJECTS) +test_crypto_LDADD = $(LDADD) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = ../libsntp.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/../libntp/libntp.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \ +test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_2) \ $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_3) $(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 @@ -158,85 +153,63 @@ am__v_lt_1 = test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_crypto_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_test_keyFile_OBJECTS = test_keyFile-keyFile.$(OBJEXT) \ - test_keyFile-run-keyFile.$(OBJEXT) \ - test_keyFile-version.$(OBJEXT) $(am__objects_1) +am_test_keyFile_OBJECTS = fileHandlingTest.$(OBJEXT) keyFile.$(OBJEXT) \ + run-keyFile.$(OBJEXT) version.$(OBJEXT) $(am__objects_1) test_keyFile_OBJECTS = $(am_test_keyFile_OBJECTS) -test_keyFile_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_keyFile_LDADD = $(LDADD) +test_keyFile_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_keyFile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_keyFile_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_test_kodDatabase_OBJECTS = test_kodDatabase-kodDatabase.$(OBJEXT) \ - test_kodDatabase-run-kodDatabase.$(OBJEXT) \ - test_kodDatabase-version.$(OBJEXT) $(am__objects_1) +am_test_kodDatabase_OBJECTS = kodDatabase.$(OBJEXT) \ + run-kodDatabase.$(OBJEXT) version.$(OBJEXT) $(am__objects_1) test_kodDatabase_OBJECTS = $(am_test_kodDatabase_OBJECTS) -test_kodDatabase_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_kodDatabase_LDADD = $(LDADD) +test_kodDatabase_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_kodDatabase_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_kodDatabase_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -am_test_kodFile_OBJECTS = test_kodFile-kodFile.$(OBJEXT) \ - test_kodFile-run-kodFile.$(OBJEXT) \ - test_kodFile-version.$(OBJEXT) $(am__objects_1) +am_test_kodFile_OBJECTS = fileHandlingTest.$(OBJEXT) kodFile.$(OBJEXT) \ + run-kodFile.$(OBJEXT) version.$(OBJEXT) $(am__objects_1) test_kodFile_OBJECTS = $(am_test_kodFile_OBJECTS) -test_kodFile_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_kodFile_LDADD = $(LDADD) +test_kodFile_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_kodFile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_kodFile_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_test_networking_OBJECTS = test_networking-networking.$(OBJEXT) \ - test_networking-run-networking.$(OBJEXT) \ - test_networking-version.$(OBJEXT) $(am__objects_1) +am_test_log_OBJECTS = t-log.$(OBJEXT) run-t-log.$(OBJEXT) \ + version.$(OBJEXT) $(am__objects_1) +test_log_OBJECTS = $(am_test_log_OBJECTS) +test_log_LDADD = $(LDADD) +test_log_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_test_networking_OBJECTS = networking.$(OBJEXT) \ + run-networking.$(OBJEXT) version.$(OBJEXT) $(am__objects_1) test_networking_OBJECTS = $(am_test_networking_OBJECTS) -test_networking_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_networking_LDADD = $(LDADD) +test_networking_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_networking_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_networking_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -am_test_packetHandling_OBJECTS = \ - test_packetHandling-packetHandling.$(OBJEXT) \ - test_packetHandling-run-packetHandling.$(OBJEXT) \ - test_packetHandling-version.$(OBJEXT) $(am__objects_1) +am_test_packetHandling_OBJECTS = packetHandling.$(OBJEXT) \ + run-packetHandling.$(OBJEXT) version.$(OBJEXT) \ + $(am__objects_1) test_packetHandling_OBJECTS = $(am_test_packetHandling_OBJECTS) -test_packetHandling_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_packetHandling_LDADD = $(LDADD) +test_packetHandling_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_packetHandling_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_packetHandling_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_test_packetProcessing_OBJECTS = \ - test_packetProcessing-packetProcessing.$(OBJEXT) \ - test_packetProcessing-run-packetProcessing.$(OBJEXT) \ +am_test_packetProcessing_OBJECTS = packetProcessing.$(OBJEXT) \ + run-packetProcessing.$(OBJEXT) sntptest.$(OBJEXT) \ $(am__objects_1) test_packetProcessing_OBJECTS = $(am_test_packetProcessing_OBJECTS) -test_packetProcessing_DEPENDENCIES = $(am__DEPENDENCIES_3) \ +test_packetProcessing_LDADD = $(LDADD) +test_packetProcessing_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -test_packetProcessing_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_packetProcessing_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_test_utilities_OBJECTS = test_utilities-utilities.$(OBJEXT) \ - test_utilities-run-utilities.$(OBJEXT) $(am__objects_1) +am_test_utilities_OBJECTS = fileHandlingTest.$(OBJEXT) \ + utilities.$(OBJEXT) run-utilities.$(OBJEXT) $(am__objects_1) test_utilities_OBJECTS = $(am_test_utilities_OBJECTS) -test_utilities_DEPENDENCIES = $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_1) -test_utilities_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(test_utilities_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ - $@ -am__objects_2 = tests_main.$(OBJEXT) $(am__objects_1) -am_tests_OBJECTS = $(am__objects_2) g_networking.$(OBJEXT) \ - g_packetHandling.$(OBJEXT) g_packetProcessing.$(OBJEXT) \ - $(am__objects_1) -tests_OBJECTS = $(am_tests_OBJECTS) -tests_LDADD = $(LDADD) -tests_DEPENDENCIES = ../libsntp.a $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(top_builddir)/../libntp/libntp.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +test_utilities_LDADD = $(LDADD) +test_utilities_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -272,34 +245,16 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -am__v_CXX_1 = -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -am__v_CXXLD_1 = SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \ $(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \ - $(test_networking_SOURCES) $(test_packetHandling_SOURCES) \ - $(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) \ - $(tests_SOURCES) + $(test_log_SOURCES) $(test_networking_SOURCES) \ + $(test_packetHandling_SOURCES) \ + $(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) DIST_SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \ $(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \ - $(test_networking_SOURCES) $(test_packetHandling_SOURCES) \ - $(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) \ - $(tests_SOURCES) + $(test_log_SOURCES) $(test_networking_SOURCES) \ + $(test_packetHandling_SOURCES) \ + $(test_packetProcessing_SOURCES) $(test_utilities_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -545,6 +500,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_THREAD = @BUILD_THREAD@ CALC_TICKADJ_DB = @CALC_TICKADJ_DB@ CALC_TICKADJ_DL = @CALC_TICKADJ_DL@ CALC_TICKADJ_DS = @CALC_TICKADJ_DS@ @@ -553,6 +509,7 @@ CALC_TICKADJ_NI = @CALC_TICKADJ_NI@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@ CFLAGS_NTP = @CFLAGS_NTP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -606,6 +563,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_SYSLOG = @LIB_SYSLOG@ LIPO = @LIPO@ LN_S = @LN_S@ +LTHREAD_LIBS = @LTHREAD_LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -774,49 +732,31 @@ NULL = #endif BUILT_SOURCES = $(srcdir)/run-crypto.c $(srcdir)/run-keyFile.c \ $(srcdir)/run-kodDatabase.c $(srcdir)/run-kodFile.c \ - $(srcdir)/run-networking.c $(srcdir)/run-packetProcessing.c \ - $(srcdir)/run-utilities.c $(srcdir)/run-packetHandling.c \ + $(srcdir)/run-networking.c $(srcdir)/run-packetHandling.c \ + $(srcdir)/run-packetProcessing.c $(srcdir)/run-utilities.c \ $(NULL) check-libsntp check-libntp check-libunity .deps-ver -CLEANFILES = kod-output-blank kod-output-single kod-output-multiple \ - debug-output-lfp-dec debug-output-lfp-bin debug-output-pkt \ +CLEANFILES = debug-output-lfp-bin debug-output-lfp-dec \ + debug-output-pkt kod-output-blank kod-output-multiple \ + kod-output-single testLogfile.log testLogfile2.log $(NULL) \ data/kod-output-multiple data/kod-output-single \ data/debug-output-pkt data/debug-output-lfp-dec \ data/kod-output-blank data/debug-output-lfp-bin $(NULL) \ check-libsntp check-libntp check-libunity .deps-ver -DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple -run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb - -#if BUILD_SNTP -#check_PROGRAMS += tests -#endif -base_SOURCES = \ - ../tests_main.cpp \ +DISTCLEANFILES = \ + kod-output-blank \ + kod-output-single \ + kod-output-multiple \ + testLogfile.log \ + testLogfile2.log \ $(NULL) -tests_SOURCES = \ - $(base_SOURCES) \ - g_networking.cpp \ - g_packetHandling.cpp \ - g_packetProcessing.cpp \ +std_unity_list = \ + $(srcdir)/../unity/auto/generate_test_runner.rb \ $(NULL) - -# HMS: this test was for the 4.2.6 sntp code. -# g_nameresolution.cpp - -# HMS: Somebody needs to audit the following files to -# make sure all of these tests are now handled by Unity -# -# g_utilities.cpp -# g_kodDatabase.cpp -# g_keyFile.cpp -# g_crypto.cpp -# g_kodFile.cpp +run_unity = cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb noinst_HEADERS = \ - fileHandlingTest.h \ sntptest.h \ - g_fileHandlingTest.h \ - g_sntptest.h \ $(NULL) dist_check_SCRIPTS = tests-runner @@ -838,93 +778,27 @@ EXTRA_DIST = \ #split into LDADD and tests_LDADD? -LDADD = \ +base_LDADD = \ ../libsntp.a \ $(LIBOPTS_LDADD) \ $(LDADD_LIBEVENT) \ $(top_builddir)/../libntp/libntp.a \ $(LDADD_LIBNTP) \ $(LDADD_NTP) \ - $(GTEST_LDFLAGS) \ - $(GTEST_LIBS) \ $(NULL) -unity_tests_LDADD = \ - $(LDADD) \ +LDADD = \ + $(base_LDADD) \ $(top_builddir)/unity/libunity.a \ $(LIBM) \ $(NULL) AM_CFLAGS = $(CFLAGS_NTP) -AM_CXXFLAGS = $(GTEST_CXXFLAGS) +#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity AM_CPPFLAGS = $(SNTP_INCS) -I$(srcdir)/.. -I$(top_srcdir)/../tests \ - $(LIBOPTS_CFLAGS) $(CPPFLAGS_LIBEVENT) $(GTEST_CPPFLAGS) \ - $(CPPFLAGS_NTP) + $(LIBOPTS_CFLAGS) $(CPPFLAGS_LIBEVENT) $(CPPFLAGS_NTP) \ + -DUNITY_INCLUDE_CONFIG_H -I$(top_srcdir)/unity AM_LDFLAGS = $(LDFLAGS_NTP) -test_keyFile_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_keyFile_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_kodDatabase_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_kodDatabase_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_kodFile_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_kodFile_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_networking_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_networking_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_utilities_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_utilities_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_crypto_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_crypto_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_packetProcessing_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_packetProcessing_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - -test_packetHandling_CFLAGS = \ - -I$(top_srcdir)/unity \ - $(NULL) - -test_packetHandling_LDADD = \ - $(unity_tests_LDADD) \ - $(NULL) - test_networking_SOURCES = \ networking.c \ run-networking.c \ @@ -944,38 +818,52 @@ test_kodDatabase_SOURCES = \ $(NULL) test_keyFile_SOURCES = \ + fileHandlingTest.c \ keyFile.c \ run-keyFile.c \ $(top_builddir)/version.c \ $(NULL) test_kodFile_SOURCES = \ + fileHandlingTest.c \ kodFile.c \ run-kodFile.c \ $(top_builddir)/version.c \ $(NULL) -# ../version.c test_packetProcessing_SOURCES = \ packetProcessing.c \ run-packetProcessing.c \ + sntptest.c \ $(NULL) test_utilities_SOURCES = \ + fileHandlingTest.c \ utilities.c \ run-utilities.c \ $(NULL) +test_crypto_CFLAGS = \ + $(CFLAGS_LIBEVENT) \ + $(AM_CFLAGS) \ + $(NULL) + test_crypto_SOURCES = \ crypto.c \ run-crypto.c \ $(top_builddir)/version.c \ $(NULL) +test_log_SOURCES = \ + t-log.c \ + run-t-log.c \ + $(top_builddir)/version.c \ + $(NULL) + #$(srcdir)/../version.c: $(srcdir)/../version.c # gcc -o version.o ../version.c -TESTS = $(am__append_3) +TESTS = $(am__append_1) SNTP_INCS = -I$(top_srcdir)/../include \ -I$(top_srcdir)/../lib/isc/include \ -I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \ @@ -984,7 +872,7 @@ all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1033,35 +921,35 @@ test-crypto$(EXEEXT): $(test_crypto_OBJECTS) $(test_crypto_DEPENDENCIES) $(EXTRA test-keyFile$(EXEEXT): $(test_keyFile_OBJECTS) $(test_keyFile_DEPENDENCIES) $(EXTRA_test_keyFile_DEPENDENCIES) @rm -f test-keyFile$(EXEEXT) - $(AM_V_CCLD)$(test_keyFile_LINK) $(test_keyFile_OBJECTS) $(test_keyFile_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_keyFile_OBJECTS) $(test_keyFile_LDADD) $(LIBS) test-kodDatabase$(EXEEXT): $(test_kodDatabase_OBJECTS) $(test_kodDatabase_DEPENDENCIES) $(EXTRA_test_kodDatabase_DEPENDENCIES) @rm -f test-kodDatabase$(EXEEXT) - $(AM_V_CCLD)$(test_kodDatabase_LINK) $(test_kodDatabase_OBJECTS) $(test_kodDatabase_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_kodDatabase_OBJECTS) $(test_kodDatabase_LDADD) $(LIBS) test-kodFile$(EXEEXT): $(test_kodFile_OBJECTS) $(test_kodFile_DEPENDENCIES) $(EXTRA_test_kodFile_DEPENDENCIES) @rm -f test-kodFile$(EXEEXT) - $(AM_V_CCLD)$(test_kodFile_LINK) $(test_kodFile_OBJECTS) $(test_kodFile_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_kodFile_OBJECTS) $(test_kodFile_LDADD) $(LIBS) + +test-log$(EXEEXT): $(test_log_OBJECTS) $(test_log_DEPENDENCIES) $(EXTRA_test_log_DEPENDENCIES) + @rm -f test-log$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_log_OBJECTS) $(test_log_LDADD) $(LIBS) test-networking$(EXEEXT): $(test_networking_OBJECTS) $(test_networking_DEPENDENCIES) $(EXTRA_test_networking_DEPENDENCIES) @rm -f test-networking$(EXEEXT) - $(AM_V_CCLD)$(test_networking_LINK) $(test_networking_OBJECTS) $(test_networking_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_networking_OBJECTS) $(test_networking_LDADD) $(LIBS) test-packetHandling$(EXEEXT): $(test_packetHandling_OBJECTS) $(test_packetHandling_DEPENDENCIES) $(EXTRA_test_packetHandling_DEPENDENCIES) @rm -f test-packetHandling$(EXEEXT) - $(AM_V_CCLD)$(test_packetHandling_LINK) $(test_packetHandling_OBJECTS) $(test_packetHandling_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_packetHandling_OBJECTS) $(test_packetHandling_LDADD) $(LIBS) test-packetProcessing$(EXEEXT): $(test_packetProcessing_OBJECTS) $(test_packetProcessing_DEPENDENCIES) $(EXTRA_test_packetProcessing_DEPENDENCIES) @rm -f test-packetProcessing$(EXEEXT) - $(AM_V_CCLD)$(test_packetProcessing_LINK) $(test_packetProcessing_OBJECTS) $(test_packetProcessing_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_packetProcessing_OBJECTS) $(test_packetProcessing_LDADD) $(LIBS) test-utilities$(EXEEXT): $(test_utilities_OBJECTS) $(test_utilities_DEPENDENCIES) $(EXTRA_test_utilities_DEPENDENCIES) @rm -f test-utilities$(EXEEXT) - $(AM_V_CCLD)$(test_utilities_LINK) $(test_utilities_OBJECTS) $(test_utilities_LDADD) $(LIBS) - -tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) $(EXTRA_tests_DEPENDENCIES) - @rm -f tests$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(tests_OBJECTS) $(tests_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_utilities_OBJECTS) $(test_utilities_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1069,32 +957,28 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_networking.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_packetHandling.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g_packetProcessing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileHandlingTest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyFile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodDatabase.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodFile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networking.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetHandling.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetProcessing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keyFile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodDatabase.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodFile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-networking.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetHandling.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetProcessing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-t-log.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-utilities.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sntptest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-crypto.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-run-crypto.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-keyFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-run-keyFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyFile-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-kodDatabase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-run-kodDatabase.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodDatabase-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-kodFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-run-kodFile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kodFile-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-networking.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-run-networking.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_networking-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-packetHandling.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-run-packetHandling.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetHandling-version.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetProcessing-packetProcessing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_packetProcessing-run-packetProcessing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utilities-run-utilities.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utilities-utilities.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests_main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1159,306 +1043,19 @@ test_crypto-version.obj: $(top_builddir)/version.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -test_keyFile-keyFile.o: keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-keyFile.o -MD -MP -MF $(DEPDIR)/test_keyFile-keyFile.Tpo -c -o test_keyFile-keyFile.o `test -f 'keyFile.c' || echo '$(srcdir)/'`keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-keyFile.Tpo $(DEPDIR)/test_keyFile-keyFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyFile.c' object='test_keyFile-keyFile.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-keyFile.o `test -f 'keyFile.c' || echo '$(srcdir)/'`keyFile.c - -test_keyFile-keyFile.obj: keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-keyFile.obj -MD -MP -MF $(DEPDIR)/test_keyFile-keyFile.Tpo -c -o test_keyFile-keyFile.obj `if test -f 'keyFile.c'; then $(CYGPATH_W) 'keyFile.c'; else $(CYGPATH_W) '$(srcdir)/keyFile.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-keyFile.Tpo $(DEPDIR)/test_keyFile-keyFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='keyFile.c' object='test_keyFile-keyFile.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-keyFile.obj `if test -f 'keyFile.c'; then $(CYGPATH_W) 'keyFile.c'; else $(CYGPATH_W) '$(srcdir)/keyFile.c'; fi` - -test_keyFile-run-keyFile.o: run-keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-run-keyFile.o -MD -MP -MF $(DEPDIR)/test_keyFile-run-keyFile.Tpo -c -o test_keyFile-run-keyFile.o `test -f 'run-keyFile.c' || echo '$(srcdir)/'`run-keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-run-keyFile.Tpo $(DEPDIR)/test_keyFile-run-keyFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-keyFile.c' object='test_keyFile-run-keyFile.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-run-keyFile.o `test -f 'run-keyFile.c' || echo '$(srcdir)/'`run-keyFile.c - -test_keyFile-run-keyFile.obj: run-keyFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-run-keyFile.obj -MD -MP -MF $(DEPDIR)/test_keyFile-run-keyFile.Tpo -c -o test_keyFile-run-keyFile.obj `if test -f 'run-keyFile.c'; then $(CYGPATH_W) 'run-keyFile.c'; else $(CYGPATH_W) '$(srcdir)/run-keyFile.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-run-keyFile.Tpo $(DEPDIR)/test_keyFile-run-keyFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-keyFile.c' object='test_keyFile-run-keyFile.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-run-keyFile.obj `if test -f 'run-keyFile.c'; then $(CYGPATH_W) 'run-keyFile.c'; else $(CYGPATH_W) '$(srcdir)/run-keyFile.c'; fi` - -test_keyFile-version.o: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-version.o -MD -MP -MF $(DEPDIR)/test_keyFile-version.Tpo -c -o test_keyFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-version.Tpo $(DEPDIR)/test_keyFile-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_keyFile-version.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c - -test_keyFile-version.obj: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -MT test_keyFile-version.obj -MD -MP -MF $(DEPDIR)/test_keyFile-version.Tpo -c -o test_keyFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_keyFile-version.Tpo $(DEPDIR)/test_keyFile-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_keyFile-version.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_keyFile_CFLAGS) $(CFLAGS) -c -o test_keyFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` - -test_kodDatabase-kodDatabase.o: kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-kodDatabase.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo -c -o test_kodDatabase-kodDatabase.o `test -f 'kodDatabase.c' || echo '$(srcdir)/'`kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-kodDatabase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kodDatabase.c' object='test_kodDatabase-kodDatabase.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-kodDatabase.o `test -f 'kodDatabase.c' || echo '$(srcdir)/'`kodDatabase.c - -test_kodDatabase-kodDatabase.obj: kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-kodDatabase.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo -c -o test_kodDatabase-kodDatabase.obj `if test -f 'kodDatabase.c'; then $(CYGPATH_W) 'kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/kodDatabase.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-kodDatabase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kodDatabase.c' object='test_kodDatabase-kodDatabase.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-kodDatabase.obj `if test -f 'kodDatabase.c'; then $(CYGPATH_W) 'kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/kodDatabase.c'; fi` - -test_kodDatabase-run-kodDatabase.o: run-kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-run-kodDatabase.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo -c -o test_kodDatabase-run-kodDatabase.o `test -f 'run-kodDatabase.c' || echo '$(srcdir)/'`run-kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-run-kodDatabase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-kodDatabase.c' object='test_kodDatabase-run-kodDatabase.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-run-kodDatabase.o `test -f 'run-kodDatabase.c' || echo '$(srcdir)/'`run-kodDatabase.c - -test_kodDatabase-run-kodDatabase.obj: run-kodDatabase.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-run-kodDatabase.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo -c -o test_kodDatabase-run-kodDatabase.obj `if test -f 'run-kodDatabase.c'; then $(CYGPATH_W) 'run-kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/run-kodDatabase.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-run-kodDatabase.Tpo $(DEPDIR)/test_kodDatabase-run-kodDatabase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-kodDatabase.c' object='test_kodDatabase-run-kodDatabase.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-run-kodDatabase.obj `if test -f 'run-kodDatabase.c'; then $(CYGPATH_W) 'run-kodDatabase.c'; else $(CYGPATH_W) '$(srcdir)/run-kodDatabase.c'; fi` - -test_kodDatabase-version.o: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-version.o -MD -MP -MF $(DEPDIR)/test_kodDatabase-version.Tpo -c -o test_kodDatabase-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-version.Tpo $(DEPDIR)/test_kodDatabase-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodDatabase-version.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c - -test_kodDatabase-version.obj: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -MT test_kodDatabase-version.obj -MD -MP -MF $(DEPDIR)/test_kodDatabase-version.Tpo -c -o test_kodDatabase-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodDatabase-version.Tpo $(DEPDIR)/test_kodDatabase-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodDatabase-version.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodDatabase_CFLAGS) $(CFLAGS) -c -o test_kodDatabase-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` - -test_kodFile-kodFile.o: kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-kodFile.o -MD -MP -MF $(DEPDIR)/test_kodFile-kodFile.Tpo -c -o test_kodFile-kodFile.o `test -f 'kodFile.c' || echo '$(srcdir)/'`kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-kodFile.Tpo $(DEPDIR)/test_kodFile-kodFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kodFile.c' object='test_kodFile-kodFile.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-kodFile.o `test -f 'kodFile.c' || echo '$(srcdir)/'`kodFile.c - -test_kodFile-kodFile.obj: kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-kodFile.obj -MD -MP -MF $(DEPDIR)/test_kodFile-kodFile.Tpo -c -o test_kodFile-kodFile.obj `if test -f 'kodFile.c'; then $(CYGPATH_W) 'kodFile.c'; else $(CYGPATH_W) '$(srcdir)/kodFile.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-kodFile.Tpo $(DEPDIR)/test_kodFile-kodFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kodFile.c' object='test_kodFile-kodFile.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-kodFile.obj `if test -f 'kodFile.c'; then $(CYGPATH_W) 'kodFile.c'; else $(CYGPATH_W) '$(srcdir)/kodFile.c'; fi` - -test_kodFile-run-kodFile.o: run-kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-run-kodFile.o -MD -MP -MF $(DEPDIR)/test_kodFile-run-kodFile.Tpo -c -o test_kodFile-run-kodFile.o `test -f 'run-kodFile.c' || echo '$(srcdir)/'`run-kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-run-kodFile.Tpo $(DEPDIR)/test_kodFile-run-kodFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-kodFile.c' object='test_kodFile-run-kodFile.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-run-kodFile.o `test -f 'run-kodFile.c' || echo '$(srcdir)/'`run-kodFile.c - -test_kodFile-run-kodFile.obj: run-kodFile.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-run-kodFile.obj -MD -MP -MF $(DEPDIR)/test_kodFile-run-kodFile.Tpo -c -o test_kodFile-run-kodFile.obj `if test -f 'run-kodFile.c'; then $(CYGPATH_W) 'run-kodFile.c'; else $(CYGPATH_W) '$(srcdir)/run-kodFile.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-run-kodFile.Tpo $(DEPDIR)/test_kodFile-run-kodFile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-kodFile.c' object='test_kodFile-run-kodFile.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-run-kodFile.obj `if test -f 'run-kodFile.c'; then $(CYGPATH_W) 'run-kodFile.c'; else $(CYGPATH_W) '$(srcdir)/run-kodFile.c'; fi` - -test_kodFile-version.o: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-version.o -MD -MP -MF $(DEPDIR)/test_kodFile-version.Tpo -c -o test_kodFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-version.Tpo $(DEPDIR)/test_kodFile-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodFile-version.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c - -test_kodFile-version.obj: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -MT test_kodFile-version.obj -MD -MP -MF $(DEPDIR)/test_kodFile-version.Tpo -c -o test_kodFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_kodFile-version.Tpo $(DEPDIR)/test_kodFile-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_kodFile-version.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_kodFile_CFLAGS) $(CFLAGS) -c -o test_kodFile-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` - -test_networking-networking.o: networking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-networking.o -MD -MP -MF $(DEPDIR)/test_networking-networking.Tpo -c -o test_networking-networking.o `test -f 'networking.c' || echo '$(srcdir)/'`networking.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-networking.Tpo $(DEPDIR)/test_networking-networking.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='networking.c' object='test_networking-networking.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-networking.o `test -f 'networking.c' || echo '$(srcdir)/'`networking.c - -test_networking-networking.obj: networking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-networking.obj -MD -MP -MF $(DEPDIR)/test_networking-networking.Tpo -c -o test_networking-networking.obj `if test -f 'networking.c'; then $(CYGPATH_W) 'networking.c'; else $(CYGPATH_W) '$(srcdir)/networking.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-networking.Tpo $(DEPDIR)/test_networking-networking.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='networking.c' object='test_networking-networking.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-networking.obj `if test -f 'networking.c'; then $(CYGPATH_W) 'networking.c'; else $(CYGPATH_W) '$(srcdir)/networking.c'; fi` - -test_networking-run-networking.o: run-networking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-run-networking.o -MD -MP -MF $(DEPDIR)/test_networking-run-networking.Tpo -c -o test_networking-run-networking.o `test -f 'run-networking.c' || echo '$(srcdir)/'`run-networking.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-run-networking.Tpo $(DEPDIR)/test_networking-run-networking.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-networking.c' object='test_networking-run-networking.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-run-networking.o `test -f 'run-networking.c' || echo '$(srcdir)/'`run-networking.c - -test_networking-run-networking.obj: run-networking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-run-networking.obj -MD -MP -MF $(DEPDIR)/test_networking-run-networking.Tpo -c -o test_networking-run-networking.obj `if test -f 'run-networking.c'; then $(CYGPATH_W) 'run-networking.c'; else $(CYGPATH_W) '$(srcdir)/run-networking.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-run-networking.Tpo $(DEPDIR)/test_networking-run-networking.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-networking.c' object='test_networking-run-networking.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-run-networking.obj `if test -f 'run-networking.c'; then $(CYGPATH_W) 'run-networking.c'; else $(CYGPATH_W) '$(srcdir)/run-networking.c'; fi` - -test_networking-version.o: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-version.o -MD -MP -MF $(DEPDIR)/test_networking-version.Tpo -c -o test_networking-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-version.Tpo $(DEPDIR)/test_networking-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_networking-version.o' libtool=no @AMDEPBACKSLASH@ +version.o: $(top_builddir)/version.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT version.o -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='version.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -test_networking-version.obj: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -MT test_networking-version.obj -MD -MP -MF $(DEPDIR)/test_networking-version.Tpo -c -o test_networking-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_networking-version.Tpo $(DEPDIR)/test_networking-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_networking-version.obj' libtool=no @AMDEPBACKSLASH@ +version.obj: $(top_builddir)/version.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT version.obj -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='version.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_networking_CFLAGS) $(CFLAGS) -c -o test_networking-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` - -test_packetHandling-packetHandling.o: packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-packetHandling.o -MD -MP -MF $(DEPDIR)/test_packetHandling-packetHandling.Tpo -c -o test_packetHandling-packetHandling.o `test -f 'packetHandling.c' || echo '$(srcdir)/'`packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-packetHandling.Tpo $(DEPDIR)/test_packetHandling-packetHandling.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='packetHandling.c' object='test_packetHandling-packetHandling.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-packetHandling.o `test -f 'packetHandling.c' || echo '$(srcdir)/'`packetHandling.c - -test_packetHandling-packetHandling.obj: packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-packetHandling.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-packetHandling.Tpo -c -o test_packetHandling-packetHandling.obj `if test -f 'packetHandling.c'; then $(CYGPATH_W) 'packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/packetHandling.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-packetHandling.Tpo $(DEPDIR)/test_packetHandling-packetHandling.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='packetHandling.c' object='test_packetHandling-packetHandling.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-packetHandling.obj `if test -f 'packetHandling.c'; then $(CYGPATH_W) 'packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/packetHandling.c'; fi` - -test_packetHandling-run-packetHandling.o: run-packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-run-packetHandling.o -MD -MP -MF $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo -c -o test_packetHandling-run-packetHandling.o `test -f 'run-packetHandling.c' || echo '$(srcdir)/'`run-packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo $(DEPDIR)/test_packetHandling-run-packetHandling.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-packetHandling.c' object='test_packetHandling-run-packetHandling.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-run-packetHandling.o `test -f 'run-packetHandling.c' || echo '$(srcdir)/'`run-packetHandling.c - -test_packetHandling-run-packetHandling.obj: run-packetHandling.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-run-packetHandling.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo -c -o test_packetHandling-run-packetHandling.obj `if test -f 'run-packetHandling.c'; then $(CYGPATH_W) 'run-packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/run-packetHandling.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-run-packetHandling.Tpo $(DEPDIR)/test_packetHandling-run-packetHandling.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-packetHandling.c' object='test_packetHandling-run-packetHandling.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-run-packetHandling.obj `if test -f 'run-packetHandling.c'; then $(CYGPATH_W) 'run-packetHandling.c'; else $(CYGPATH_W) '$(srcdir)/run-packetHandling.c'; fi` - -test_packetHandling-version.o: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-version.o -MD -MP -MF $(DEPDIR)/test_packetHandling-version.Tpo -c -o test_packetHandling-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-version.Tpo $(DEPDIR)/test_packetHandling-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_packetHandling-version.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c - -test_packetHandling-version.obj: $(top_builddir)/version.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -MT test_packetHandling-version.obj -MD -MP -MF $(DEPDIR)/test_packetHandling-version.Tpo -c -o test_packetHandling-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetHandling-version.Tpo $(DEPDIR)/test_packetHandling-version.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/version.c' object='test_packetHandling-version.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetHandling_CFLAGS) $(CFLAGS) -c -o test_packetHandling-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` - -test_packetProcessing-packetProcessing.o: packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-packetProcessing.o -MD -MP -MF $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo -c -o test_packetProcessing-packetProcessing.o `test -f 'packetProcessing.c' || echo '$(srcdir)/'`packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-packetProcessing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='packetProcessing.c' object='test_packetProcessing-packetProcessing.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-packetProcessing.o `test -f 'packetProcessing.c' || echo '$(srcdir)/'`packetProcessing.c - -test_packetProcessing-packetProcessing.obj: packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-packetProcessing.obj -MD -MP -MF $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo -c -o test_packetProcessing-packetProcessing.obj `if test -f 'packetProcessing.c'; then $(CYGPATH_W) 'packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/packetProcessing.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-packetProcessing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='packetProcessing.c' object='test_packetProcessing-packetProcessing.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-packetProcessing.obj `if test -f 'packetProcessing.c'; then $(CYGPATH_W) 'packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/packetProcessing.c'; fi` - -test_packetProcessing-run-packetProcessing.o: run-packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-run-packetProcessing.o -MD -MP -MF $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo -c -o test_packetProcessing-run-packetProcessing.o `test -f 'run-packetProcessing.c' || echo '$(srcdir)/'`run-packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-run-packetProcessing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-packetProcessing.c' object='test_packetProcessing-run-packetProcessing.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-run-packetProcessing.o `test -f 'run-packetProcessing.c' || echo '$(srcdir)/'`run-packetProcessing.c - -test_packetProcessing-run-packetProcessing.obj: run-packetProcessing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -MT test_packetProcessing-run-packetProcessing.obj -MD -MP -MF $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo -c -o test_packetProcessing-run-packetProcessing.obj `if test -f 'run-packetProcessing.c'; then $(CYGPATH_W) 'run-packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/run-packetProcessing.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_packetProcessing-run-packetProcessing.Tpo $(DEPDIR)/test_packetProcessing-run-packetProcessing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-packetProcessing.c' object='test_packetProcessing-run-packetProcessing.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_packetProcessing_CFLAGS) $(CFLAGS) -c -o test_packetProcessing-run-packetProcessing.obj `if test -f 'run-packetProcessing.c'; then $(CYGPATH_W) 'run-packetProcessing.c'; else $(CYGPATH_W) '$(srcdir)/run-packetProcessing.c'; fi` - -test_utilities-utilities.o: utilities.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-utilities.o -MD -MP -MF $(DEPDIR)/test_utilities-utilities.Tpo -c -o test_utilities-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-utilities.Tpo $(DEPDIR)/test_utilities-utilities.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utilities.c' object='test_utilities-utilities.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-utilities.o `test -f 'utilities.c' || echo '$(srcdir)/'`utilities.c - -test_utilities-utilities.obj: utilities.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-utilities.obj -MD -MP -MF $(DEPDIR)/test_utilities-utilities.Tpo -c -o test_utilities-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-utilities.Tpo $(DEPDIR)/test_utilities-utilities.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utilities.c' object='test_utilities-utilities.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-utilities.obj `if test -f 'utilities.c'; then $(CYGPATH_W) 'utilities.c'; else $(CYGPATH_W) '$(srcdir)/utilities.c'; fi` - -test_utilities-run-utilities.o: run-utilities.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-run-utilities.o -MD -MP -MF $(DEPDIR)/test_utilities-run-utilities.Tpo -c -o test_utilities-run-utilities.o `test -f 'run-utilities.c' || echo '$(srcdir)/'`run-utilities.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-run-utilities.Tpo $(DEPDIR)/test_utilities-run-utilities.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-utilities.c' object='test_utilities-run-utilities.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-run-utilities.o `test -f 'run-utilities.c' || echo '$(srcdir)/'`run-utilities.c - -test_utilities-run-utilities.obj: run-utilities.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -MT test_utilities-run-utilities.obj -MD -MP -MF $(DEPDIR)/test_utilities-run-utilities.Tpo -c -o test_utilities-run-utilities.obj `if test -f 'run-utilities.c'; then $(CYGPATH_W) 'run-utilities.c'; else $(CYGPATH_W) '$(srcdir)/run-utilities.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_utilities-run-utilities.Tpo $(DEPDIR)/test_utilities-run-utilities.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='run-utilities.c' object='test_utilities-run-utilities.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_utilities_CFLAGS) $(CFLAGS) -c -o test_utilities-run-utilities.obj `if test -f 'run-utilities.c'; then $(CYGPATH_W) 'run-utilities.c'; else $(CYGPATH_W) '$(srcdir)/run-utilities.c'; fi` - -.cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cpp.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< - -tests_main.o: ../tests_main.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.o -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.o `test -f '../tests_main.cpp' || echo '$(srcdir)/'`../tests_main.cpp -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../tests_main.cpp' object='tests_main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.o `test -f '../tests_main.cpp' || echo '$(srcdir)/'`../tests_main.cpp - -tests_main.obj: ../tests_main.cpp -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tests_main.obj -MD -MP -MF $(DEPDIR)/tests_main.Tpo -c -o tests_main.obj `if test -f '../tests_main.cpp'; then $(CYGPATH_W) '../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tests_main.Tpo $(DEPDIR)/tests_main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='../tests_main.cpp' object='tests_main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tests_main.obj `if test -f '../tests_main.cpp'; then $(CYGPATH_W) '../tests_main.cpp'; else $(CYGPATH_W) '$(srcdir)/../tests_main.cpp'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1687,6 +1284,13 @@ test-kodFile.log: test-kodFile$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-log.log: test-log$(EXEEXT) + @p='test-log$(EXEEXT)'; \ + b='test-log'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-networking.log: test-networking$(EXEEXT) @p='test-networking$(EXEEXT)'; \ b='test-networking'; \ @@ -1715,13 +1319,6 @@ test-utilities.log: test-utilities$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -tests.log: tests$(EXEEXT) - @p='tests$(EXEEXT)'; \ - b='tests'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \ @@ -1926,6 +1523,9 @@ $(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list) $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list) $(run_unity) crypto.c run-crypto.c +$(srcdir)/run-t-log.c: $(srcdir)/t-log.c $(std_unity_list) + $(run_unity) t-log.c run-t-log.c + check-libsntp: ../libsntp.a @echo stamp > $@ @@ -1938,10 +1538,10 @@ check-libntp: ../../libntp/libntp.a ../../libntp/libntp.a: cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a -check-libunity: ../sntp/unity/libunity.a +check-libunity: ../unity/libunity.a @echo stamp > $@ -../sntp/unity/libunity.a: +../unity/libunity.a: cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver @[ -f $@ ] || \ diff --git a/contrib/ntp/sntp/tests/crypto.c b/contrib/ntp/sntp/tests/crypto.c index 254469e..82d2859 100644 --- a/contrib/ntp/sntp/tests/crypto.c +++ b/contrib/ntp/sntp/tests/crypto.c @@ -8,7 +8,17 @@ #define MD5_LENGTH 16 #define SHA1_LENGTH 20 -void test_MakeMd5Mac(void) { + +void test_MakeMd5Mac(void); +void test_MakeSHA1Mac(void); +void test_VerifyCorrectMD5(void); +void test_VerifySHA1(void); +void test_VerifyFailure(void); +void test_PacketSizeNotMultipleOfFourBytes(void); + + +void +test_MakeMd5Mac(void) { const char* PKT_DATA = "abcdefgh0123"; const int PKT_LEN = strlen(PKT_DATA); @@ -30,7 +40,8 @@ void test_MakeMd5Mac(void) { } -void test_MakeSHA1Mac(void) { +void +test_MakeSHA1Mac(void) { #ifdef OPENSSL const char* PKT_DATA = "abcdefgh0123"; const int PKT_LEN = strlen(PKT_DATA); @@ -49,14 +60,15 @@ void test_MakeSHA1Mac(void) { TEST_ASSERT_EQUAL(SHA1_LENGTH, make_mac((char*)PKT_DATA, PKT_LEN, SHA1_LENGTH, &sha1, actual)); - TEST_ASSERT_TRUE(memcmp(EXPECTED_DIGEST, actual, SHA1_LENGTH) == 0); + TEST_ASSERT_EQUAL_MEMORY(EXPECTED_DIGEST, actual, SHA1_LENGTH); #else TEST_IGNORE_MESSAGE("OpenSSL not found, skipping..."); #endif /* OPENSSL */ } -void test_VerifyCorrectMD5(void) { +void +test_VerifyCorrectMD5(void) { const char* PKT_DATA = "sometestdata" // Data "\0\0\0\0" // Key-ID (unused) @@ -75,7 +87,8 @@ void test_VerifyCorrectMD5(void) { } -void test_VerifySHA1(void) { +void +test_VerifySHA1(void) { #ifdef OPENSSL const char* PKT_DATA = "sometestdata" // Data @@ -97,7 +110,8 @@ void test_VerifySHA1(void) { #endif /* OPENSSL */ } -void test_VerifyFailure(void) { +void +test_VerifyFailure(void) { /* We use a copy of the MD5 verification code, but modify * the last bit to make sure verification fails. */ const char* PKT_DATA = @@ -117,7 +131,9 @@ void test_VerifyFailure(void) { TEST_ASSERT_FALSE(auth_md5((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5)); } -void test_PacketSizeNotMultipleOfFourBytes(void) { + +void +test_PacketSizeNotMultipleOfFourBytes(void) { const char* PKT_DATA = "123456"; const int PKT_LEN = 6; char actual[MD5_LENGTH]; @@ -131,4 +147,3 @@ void test_PacketSizeNotMultipleOfFourBytes(void) { TEST_ASSERT_EQUAL(0, make_mac((char*)PKT_DATA, PKT_LEN, MD5_LENGTH, &md5, actual)); } - diff --git a/contrib/ntp/sntp/tests/fileHandlingTest.c b/contrib/ntp/sntp/tests/fileHandlingTest.c new file mode 100644 index 0000000..ce3f0de --- /dev/null +++ b/contrib/ntp/sntp/tests/fileHandlingTest.c @@ -0,0 +1,74 @@ + +#include "config.h" +#include "stdlib.h" +#include "sntptest.h" + +#include "fileHandlingTest.h" //required because of the h.in thingy + +#include <string.h> +#include <unistd.h> + +/* +enum DirectoryType { + INPUT_DIR = 0, + OUTPUT_DIR = 1 +}; +*/ +//extern const char srcdir[]; + +const char * +CreatePath(const char* filename, enum DirectoryType argument) { + const char srcdir[] = SRCDIR_DEF;//"@abs_srcdir@/data/"; + char * path = emalloc (sizeof (char) * (strlen(srcdir) + 256)); + + //char cwd[1024]; + + strcpy(path, srcdir); + strcat(path, filename); + + return path; +} + + +int +GetFileSize(FILE *file) { + fseek(file, 0L, SEEK_END); + int length = ftell(file); + fseek(file, 0L, SEEK_SET); + + return length; +} + + +bool +CompareFileContent(FILE* expected, FILE* actual) { + int currentLine = 1; + + char actualLine[1024]; + char expectedLine[1024]; + size_t lenAct = sizeof actualLine; + size_t lenExp = sizeof expectedLine; + + while ( ( (fgets(actualLine, lenAct, actual)) != NULL) + && ( (fgets(expectedLine, lenExp, expected)) != NULL ) + ) { + + + if( strcmp(actualLine,expectedLine) !=0 ){ + printf("Comparision failed on line %d",currentLine); + return FALSE; + } + + currentLine++; + } + + return TRUE; +} + + +void +ClearFile(const char * filename) { + if (!truncate(filename, 0)) + exit(1); +} + diff --git a/contrib/ntp/sntp/tests/fileHandlingTest.h b/contrib/ntp/sntp/tests/fileHandlingTest.h deleted file mode 100644 index 38c3fa6..0000000 --- a/contrib/ntp/sntp/tests/fileHandlingTest.h +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef FILE_HANDLING_TEST_H -#define FILE_HANDLING_TEST_H - -#include "stdlib.h" -#include "sntptest.h" - -#include <string.h> -#include <unistd.h> - - -enum DirectoryType { - INPUT_DIR = 0, - OUTPUT_DIR = 1 -}; - -const char * CreatePath(const char* filename, enum DirectoryType argument) { - - char * path = malloc (sizeof (char) * 256); - - /* - if (m_params.size() >= argument + 1) { - path = m_params[argument]; - } - - if (path[path.size()-1] != DIR_SEP && !path.empty()) { - path.append(1, DIR_SEP); - } - */ - //strcpy(path,filename); - //path.append(filename); - - //return path; - - char cwd[1024]; - if (getcwd(cwd, sizeof(cwd)) != NULL) - printf("Current working dir: %s\n", cwd); - - printf("builddir is <.>\n"); - printf("abs_srcdir is </deacon/backroom/snaps/ntp-stable/sntp/tests>\n"); - strcpy(path,"/deacon/backroom/snaps/ntp-stable/sntp/tests/data/"); - - //strcpy(path,""); - strcat(path,filename); - printf("PATH IS : %s\n",path); - return path; -} - -int GetFileSize(FILE *file) { - - fseek(file, 0L, SEEK_END); - int length = ftell(file); - fseek(file, 0L, SEEK_SET); - - //int initial = file.tellg(); - - //file.seekg(0, ios::end); - //int length = file.tellg(); - //file.seekg(initial); - - return length; -} - -bool CompareFileContent(FILE* expected, FILE* actual) { - int currentLine = 1; - - char actualLine[1024]; - char expectedLine[1024]; - size_t lenAct = sizeof actualLine; - size_t lenExp = sizeof expectedLine; - - while ( ( (fgets(actualLine, lenAct, actual)) != NULL) - && ( (fgets(expectedLine, lenExp, expected)) != NULL ) - ) { - - //printf("%s",actualLine); - //printf("%s",expectedLine); - - if( strcmp(actualLine,expectedLine) !=0 ){ - printf("Comparision failed on line %d",currentLine); - return FALSE; - } - - //I removed this and modified the test kodFile.c, because there shouldn't be any ASSERTs in .h files! - //TEST_ASSERT_EQUAL_STRING(actualLine,expectedLine);//EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine; - currentLine++; - } - - return TRUE; -} - -void ClearFile(const char * filename) { - FILE * clear = fopen(filename, "w");//ios::trunc); //similar to truncate, I GUESS???! - - //I removed this because there shouldn't be any ASSERTs in .h files! - //TEST_ASSERT_TRUE(clear != NULL); - fclose(clear); -} - - -#endif // FILE_HANDLING_TEST_H diff --git a/contrib/ntp/sntp/tests/fileHandlingTest.h.in b/contrib/ntp/sntp/tests/fileHandlingTest.h.in index 8ff9d34..e7d99ee 100644 --- a/contrib/ntp/sntp/tests/fileHandlingTest.h.in +++ b/contrib/ntp/sntp/tests/fileHandlingTest.h.in @@ -1,6 +1,7 @@ #ifndef FILE_HANDLING_TEST_H #define FILE_HANDLING_TEST_H +#include "config.h" #include "stdlib.h" #include "sntptest.h" @@ -13,88 +14,22 @@ enum DirectoryType { OUTPUT_DIR = 1 }; -const char * CreatePath(const char* filename, enum DirectoryType argument) { - - char * path = malloc (sizeof (char) * 256); +#define SRCDIR_DEF "@abs_srcdir@/data/"; +//const char srcdir[] = "@abs_srcdir@/data/"; - /* - if (m_params.size() >= argument + 1) { - path = m_params[argument]; - } +const char * +CreatePath(const char* filename, enum DirectoryType argument); - if (path[path.size()-1] != DIR_SEP && !path.empty()) { - path.append(1, DIR_SEP); - } - */ - //strcpy(path,filename); - //path.append(filename); - //return path; +int +GetFileSize(FILE *file); - char cwd[1024]; - if (getcwd(cwd, sizeof(cwd)) != NULL) - printf("Current working dir: %s\n", cwd); - - printf("builddir is <@builddir@>\n"); - printf("abs_srcdir is <@abs_srcdir@>\n"); - strcpy(path,"@abs_srcdir@/data/"); - //strcpy(path,""); - strcat(path,filename); - printf("PATH IS : %s\n",path); - return path; -} +bool +CompareFileContent(FILE* expected, FILE* actual); -int GetFileSize(FILE *file) { - - fseek(file, 0L, SEEK_END); - int length = ftell(file); - fseek(file, 0L, SEEK_SET); - - //int initial = file.tellg(); - - //file.seekg(0, ios::end); - //int length = file.tellg(); - //file.seekg(initial); - - return length; -} - -bool CompareFileContent(FILE* expected, FILE* actual) { - int currentLine = 1; - - char actualLine[1024]; - char expectedLine[1024]; - size_t lenAct = sizeof actualLine; - size_t lenExp = sizeof expectedLine; - - while ( ( (fgets(actualLine, lenAct, actual)) != NULL) - && ( (fgets(expectedLine, lenExp, expected)) != NULL ) - ) { - - //printf("%s",actualLine); - //printf("%s",expectedLine); - - if( strcmp(actualLine,expectedLine) !=0 ){ - printf("Comparision failed on line %d",currentLine); - return FALSE; - } - - //I removed this and modified the test kodFile.c, because there shouldn't be any ASSERTs in .h files! - //TEST_ASSERT_EQUAL_STRING(actualLine,expectedLine);//EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine; - currentLine++; - } - - return TRUE; -} - -void ClearFile(const char * filename) { - FILE * clear = fopen(filename, "w");//ios::trunc); //similar to truncate, I GUESS???! - - //I removed this because there shouldn't be any ASSERTs in .h files! - //TEST_ASSERT_TRUE(clear != NULL); - fclose(clear); -} +void +ClearFile(const char * filename) ; #endif // FILE_HANDLING_TEST_H diff --git a/contrib/ntp/sntp/tests/g_fileHandlingTest.h b/contrib/ntp/sntp/tests/g_fileHandlingTest.h deleted file mode 100644 index 7c8a78a..0000000 --- a/contrib/ntp/sntp/tests/g_fileHandlingTest.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef FILE_HANDLING_TEST_H -#define FILE_HANDLING_TEST_H - -#include "g_sntptest.h" - -#include <fstream> -#include <string> - -using std::ifstream; -using std::string; -using std::ios; - -class fileHandlingTest : public sntptest { -protected: - enum DirectoryType { - INPUT_DIR = 0, - OUTPUT_DIR = 1 - }; - - std::string CreatePath(const char* filename, DirectoryType argument) { - std::string path; - - if (m_params.size() >= argument + 1) { - path = m_params[argument]; - } - - if (path[path.size()-1] != DIR_SEP && !path.empty()) { - path.append(1, DIR_SEP); - } - path.append(filename); - - return path; - } - - int GetFileSize(ifstream& file) { - int initial = file.tellg(); - - file.seekg(0, ios::end); - int length = file.tellg(); - file.seekg(initial); - - return length; - } - - void CompareFileContent(ifstream& expected, ifstream& actual) { - int currentLine = 1; - while (actual.good() && expected.good()) { - string actualLine, expectedLine; - getline(actual, actualLine); - getline(expected, expectedLine); - - EXPECT_EQ(expectedLine, actualLine) << "Comparision failed on line " << currentLine; - currentLine++; - } - } - - void ClearFile(const std::string& filename) { - std::ofstream clear(filename.c_str(), ios::trunc); - ASSERT_TRUE(clear.good()); - clear.close(); - } -}; - -#endif // FILE_HANDLING_TEST_H diff --git a/contrib/ntp/sntp/tests/g_networking.cpp b/contrib/ntp/sntp/tests/g_networking.cpp deleted file mode 100644 index d75f4a5..0000000 --- a/contrib/ntp/sntp/tests/g_networking.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "g_sntptest.h" - -extern "C" { -#include "networking.h" -}; diff --git a/contrib/ntp/sntp/tests/g_packetHandling.cpp b/contrib/ntp/sntp/tests/g_packetHandling.cpp deleted file mode 100644 index bd5b14e..0000000 --- a/contrib/ntp/sntp/tests/g_packetHandling.cpp +++ /dev/null @@ -1,264 +0,0 @@ -#include "g_sntptest.h" - -extern "C" { -#include "kod_management.h" -#include "main.h" -#include "networking.h" -#include "ntp.h" -}; - -class mainTest : public sntptest { -protected: - ::testing::AssertionResult LfpEquality(const l_fp &expected, const l_fp &actual) { - if (L_ISEQU(&expected, &actual)) { - return ::testing::AssertionSuccess(); - } else { - return ::testing::AssertionFailure() - << " expected: " << lfptoa(&expected, FRACTION_PREC) - << " (" << expected.l_ui << "." << expected.l_uf << ")" - << " but was: " << lfptoa(&actual, FRACTION_PREC) - << " (" << actual.l_ui << "." << actual.l_uf << ")"; - } - } -}; - -TEST_F(mainTest, GenerateUnauthenticatedPacket) { - pkt testpkt; - - timeval xmt; - GETTIMEOFDAY(&xmt, NULL); - xmt.tv_sec += JAN_1970; - - EXPECT_EQ(LEN_PKT_NOMAC, - generate_pkt(&testpkt, &xmt, 0, NULL)); - - EXPECT_EQ(LEAP_NOTINSYNC, PKT_LEAP(testpkt.li_vn_mode)); - EXPECT_EQ(NTP_VERSION, PKT_VERSION(testpkt.li_vn_mode)); - EXPECT_EQ(MODE_CLIENT, PKT_MODE(testpkt.li_vn_mode)); - - EXPECT_EQ(STRATUM_UNSPEC, PKT_TO_STRATUM(testpkt.stratum)); - EXPECT_EQ(8, testpkt.ppoll); - - l_fp expected_xmt, actual_xmt; - TVTOTS(&xmt, &expected_xmt); - NTOHL_FP(&testpkt.xmt, &actual_xmt); - EXPECT_TRUE(LfpEquality(expected_xmt, actual_xmt)); -} - -TEST_F(mainTest, GenerateAuthenticatedPacket) { - key testkey; - testkey.next = NULL; - testkey.key_id = 30; - testkey.key_len = 9; - memcpy(testkey.key_seq, "123456789", testkey.key_len); - memcpy(testkey.type, "MD5", 3); - - pkt testpkt; - - timeval xmt; - GETTIMEOFDAY(&xmt, NULL); - xmt.tv_sec += JAN_1970; - - const int EXPECTED_PKTLEN = LEN_PKT_NOMAC + MAX_MD5_LEN; - - EXPECT_EQ(EXPECTED_PKTLEN, - generate_pkt(&testpkt, &xmt, testkey.key_id, &testkey)); - - EXPECT_EQ(LEAP_NOTINSYNC, PKT_LEAP(testpkt.li_vn_mode)); - EXPECT_EQ(NTP_VERSION, PKT_VERSION(testpkt.li_vn_mode)); - EXPECT_EQ(MODE_CLIENT, PKT_MODE(testpkt.li_vn_mode)); - - EXPECT_EQ(STRATUM_UNSPEC, PKT_TO_STRATUM(testpkt.stratum)); - EXPECT_EQ(8, testpkt.ppoll); - - l_fp expected_xmt, actual_xmt; - TVTOTS(&xmt, &expected_xmt); - NTOHL_FP(&testpkt.xmt, &actual_xmt); - EXPECT_TRUE(LfpEquality(expected_xmt, actual_xmt)); - - EXPECT_EQ(testkey.key_id, ntohl(testpkt.exten[0])); - - char expected_mac[MAX_MD5_LEN]; - ASSERT_EQ(MAX_MD5_LEN - 4, // Remove the key_id, only keep the mac. - make_mac((char*)&testpkt, LEN_PKT_NOMAC, MAX_MD5_LEN, &testkey, expected_mac)); - EXPECT_TRUE(memcmp(expected_mac, (char*)&testpkt.exten[1], MAX_MD5_LEN -4) == 0); -} - -TEST_F(mainTest, OffsetCalculationPositiveOffset) { - pkt rpkt; - - rpkt.precision = -16; // 0,000015259 - rpkt.rootdelay = HTONS_FP(DTOUFP(0.125)); - rpkt.rootdisp = HTONS_FP(DTOUFP(0.25)); - // Synch Distance: (0.125+0.25)/2.0 == 0.1875 - l_fp reftime; - get_systime(&reftime); - HTONL_FP(&reftime, &rpkt.reftime); - - l_fp tmp; - - // T1 - Originate timestamp - tmp.l_ui = 1000000000UL; - tmp.l_uf = 0UL; - HTONL_FP(&tmp, &rpkt.org); - - // T2 - Receive timestamp - tmp.l_ui = 1000000001UL; - tmp.l_uf = 2147483648UL; - HTONL_FP(&tmp, &rpkt.rec); - - // T3 - Transmit timestamp - tmp.l_ui = 1000000002UL; - tmp.l_uf = 0UL; - HTONL_FP(&tmp, &rpkt.xmt); - - // T4 - Destination timestamp as standard timeval - tmp.l_ui = 1000000001UL; - tmp.l_uf = 0UL; - timeval dst; - TSTOTV(&tmp, &dst); - dst.tv_sec -= JAN_1970; - - double offset, precision, synch_distance; - offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance); - - EXPECT_DOUBLE_EQ(1.25, offset); - EXPECT_DOUBLE_EQ(1. / ULOGTOD(16), precision); - // 1.1250150000000001 ? - EXPECT_DOUBLE_EQ(1.125015, synch_distance); -} - -TEST_F(mainTest, OffsetCalculationNegativeOffset) { - pkt rpkt; - - rpkt.precision = -1; - rpkt.rootdelay = HTONS_FP(DTOUFP(0.5)); - rpkt.rootdisp = HTONS_FP(DTOUFP(0.5)); - // Synch Distance is (0.5+0.5)/2.0, or 0.5 - l_fp reftime; - get_systime(&reftime); - HTONL_FP(&reftime, &rpkt.reftime); - - l_fp tmp; - - // T1 - Originate timestamp - tmp.l_ui = 1000000001UL; - tmp.l_uf = 0UL; - HTONL_FP(&tmp, &rpkt.org); - - // T2 - Receive timestamp - tmp.l_ui = 1000000000UL; - tmp.l_uf = 2147483648UL; - HTONL_FP(&tmp, &rpkt.rec); - - // T3 - Transmit timestamp - tmp.l_ui = 1000000001UL; - tmp.l_uf = 2147483648UL; - HTONL_FP(&tmp, &rpkt.xmt); - - // T4 - Destination timestamp as standard timeval - tmp.l_ui = 1000000003UL; - tmp.l_uf = 0UL; - timeval dst; - TSTOTV(&tmp, &dst); - dst.tv_sec -= JAN_1970; - - double offset, precision, synch_distance; - offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance); - - EXPECT_DOUBLE_EQ(-1, offset); - EXPECT_DOUBLE_EQ(1. / ULOGTOD(1), precision); - EXPECT_DOUBLE_EQ(1.3333483333333334, synch_distance); -} - -TEST_F(mainTest, HandleUnusableServer) { - pkt rpkt; - sockaddr_u host; - int rpktl; - - ZERO(rpkt); - ZERO(host); - rpktl = SERVER_UNUSEABLE; - EXPECT_EQ(-1, handle_pkt(rpktl, &rpkt, &host, "")); -} - -TEST_F(mainTest, HandleUnusablePacket) { - pkt rpkt; - sockaddr_u host; - int rpktl; - - ZERO(rpkt); - ZERO(host); - rpktl = PACKET_UNUSEABLE; - EXPECT_EQ(1, handle_pkt(rpktl, &rpkt, &host, "")); -} - -TEST_F(mainTest, HandleServerAuthenticationFailure) { - pkt rpkt; - sockaddr_u host; - int rpktl; - - ZERO(rpkt); - ZERO(host); - rpktl = SERVER_AUTH_FAIL; - EXPECT_EQ(1, handle_pkt(rpktl, &rpkt, &host, "")); -} - -TEST_F(mainTest, HandleKodDemobilize) { - const char * HOSTNAME = "192.0.2.1"; - const char * REASON = "DENY"; - pkt rpkt; - sockaddr_u host; - int rpktl; - kod_entry * entry; - - rpktl = KOD_DEMOBILIZE; - ZERO(rpkt); - memcpy(&rpkt.refid, REASON, 4); - ZERO(host); - host.sa4.sin_family = AF_INET; - host.sa4.sin_addr.s_addr = inet_addr(HOSTNAME); - - // Test that the KOD-entry is added to the database. - kod_init_kod_db("/dev/null", TRUE); - - EXPECT_EQ(1, handle_pkt(rpktl, &rpkt, &host, HOSTNAME)); - - ASSERT_EQ(1, search_entry(HOSTNAME, &entry)); - EXPECT_TRUE(memcmp(REASON, entry->type, 4) == 0); -} - -TEST_F(mainTest, HandleKodRate) { - pkt rpkt; - sockaddr_u host; - int rpktl; - - ZERO(rpkt); - ZERO(host); - rpktl = KOD_RATE; - EXPECT_EQ(1, handle_pkt(rpktl, &rpkt, &host, "")); -} - -TEST_F(mainTest, HandleCorrectPacket) { - pkt rpkt; - sockaddr_u host; - int rpktl; - l_fp now; - - // We don't want our testing code to actually change the system clock. - ASSERT_FALSE(ENABLED_OPT(STEP)); - ASSERT_FALSE(ENABLED_OPT(SLEW)); - - get_systime(&now); - HTONL_FP(&now, &rpkt.reftime); - HTONL_FP(&now, &rpkt.org); - HTONL_FP(&now, &rpkt.rec); - HTONL_FP(&now, &rpkt.xmt); - rpktl = LEN_PKT_NOMAC; - ZERO(host); - AF(&host) = AF_INET; - - EXPECT_EQ(0, handle_pkt(rpktl, &rpkt, &host, "")); -} - -/* packetHandling.cpp */ diff --git a/contrib/ntp/sntp/tests/g_packetProcessing.cpp b/contrib/ntp/sntp/tests/g_packetProcessing.cpp deleted file mode 100644 index 85659a4..0000000 --- a/contrib/ntp/sntp/tests/g_packetProcessing.cpp +++ /dev/null @@ -1,334 +0,0 @@ -#include "g_sntptest.h" - -extern "C" { -#include "networking.h" -#include "ntp_stdlib.h" -}; - -#include <sstream> -#include <string> - -// Hacks into the key database. -extern key* key_ptr; -extern int key_cnt; - -class packetProcessingTest : public sntptest { -protected: - pkt testpkt; - pkt testspkt; - sockaddr_u testsock; - bool restoreKeyDb; - - void PrepareAuthenticationTest(int key_id, - int key_len, - const char* type, - const void* key_seq) { - std::stringstream ss; - ss << key_id; - - ActivateOption("-a", ss.str().c_str()); - - key_cnt = 1; - key_ptr = new key; - key_ptr->next = NULL; - key_ptr->key_id = key_id; - key_ptr->key_len = key_len; - memcpy(key_ptr->type, "MD5", 3); - - ASSERT_TRUE(key_len < sizeof(key_ptr->key_seq)); - - memcpy(key_ptr->key_seq, key_seq, key_ptr->key_len); - restoreKeyDb = true; - } - - void PrepareAuthenticationTest(int key_id, - int key_len, - const void* key_seq) { - PrepareAuthenticationTest(key_id, key_len, "MD5", key_seq); - } - - virtual void SetUp() { - restoreKeyDb = false; - - /* Initialize the test packet and socket, - * so they contain at least some valid data. */ - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, NTP_VERSION, - MODE_SERVER); - testpkt.stratum = STRATUM_REFCLOCK; - memcpy(&testpkt.refid, "GPS\0", 4); - - /* Set the origin timestamp of the received packet to the - * same value as the transmit timestamp of the sent packet. */ - l_fp tmp; - tmp.l_ui = 1000UL; - tmp.l_uf = 0UL; - - HTONL_FP(&tmp, &testpkt.org); - HTONL_FP(&tmp, &testspkt.xmt); - } - - virtual void TearDown() { - if (restoreKeyDb) { - key_cnt = 0; - delete key_ptr; - key_ptr = NULL; - } - } -}; - -TEST_F(packetProcessingTest, TooShortLength) { - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC - 1, - MODE_SERVER, &testspkt, "UnitTest")); - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC - 1, - MODE_BROADCAST, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, LengthNotMultipleOfFour) { - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC + 6, - MODE_SERVER, &testspkt, "UnitTest")); - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC + 3, - MODE_BROADCAST, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, TooShortExtensionFieldLength) { - /* The lower 16-bits are the length of the extension field. - * This lengths must be multiples of 4 bytes, which gives - * a minimum of 4 byte extension field length. */ - testpkt.exten[7] = htonl(3); // 3 bytes is too short. - - /* We send in a pkt_len of header size + 4 byte extension - * header + 24 byte MAC, this prevents the length error to - * be caught at an earlier stage */ - int pkt_len = LEN_PKT_NOMAC + 4 + 24; - - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, UnauthenticatedPacketReject) { - // Activate authentication option - ActivateOption("-a", "123"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - int pkt_len = LEN_PKT_NOMAC; - - // We demand authentication, but no MAC header is present. - EXPECT_EQ(SERVER_AUTH_FAIL, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, CryptoNAKPacketReject) { - // Activate authentication option - ActivateOption("-a", "123"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - int pkt_len = LEN_PKT_NOMAC + 4; // + 4 byte MAC = Crypto-NAK - - EXPECT_EQ(SERVER_AUTH_FAIL, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, AuthenticatedPacketInvalid) { - // Activate authentication option - PrepareAuthenticationTest(50, 9, "123456789"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - // Prepare the packet. - int pkt_len = LEN_PKT_NOMAC; - - testpkt.exten[0] = htonl(50); - int mac_len = make_mac((char*)&testpkt, pkt_len, - MAX_MD5_LEN, key_ptr, - (char*)&testpkt.exten[1]); - - pkt_len += 4 + mac_len; - - // Now, alter the MAC so it becomes invalid. - testpkt.exten[1] += 1; - - EXPECT_EQ(SERVER_AUTH_FAIL, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, AuthenticatedPacketUnknownKey) { - // Activate authentication option - PrepareAuthenticationTest(30, 9, "123456789"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - // Prepare the packet. Observe that the Key-ID expected is 30, - // but the packet has a key id of 50. - int pkt_len = LEN_PKT_NOMAC; - - testpkt.exten[0] = htonl(50); - int mac_len = make_mac((char*)&testpkt, pkt_len, - MAX_MD5_LEN, key_ptr, - (char*)&testpkt.exten[1]); - pkt_len += 4 + mac_len; - - EXPECT_EQ(SERVER_AUTH_FAIL, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, ServerVersionTooOld) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, - NTP_OLDVERSION - 1, - MODE_CLIENT); - ASSERT_LT(PKT_VERSION(testpkt.li_vn_mode), NTP_OLDVERSION); - - int pkt_len = LEN_PKT_NOMAC; - - EXPECT_EQ(SERVER_UNUSEABLE, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, ServerVersionTooNew) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, - NTP_VERSION + 1, - MODE_CLIENT); - ASSERT_GT(PKT_VERSION(testpkt.li_vn_mode), NTP_VERSION); - - int pkt_len = LEN_PKT_NOMAC; - - EXPECT_EQ(SERVER_UNUSEABLE, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, NonWantedMode) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, - NTP_VERSION, - MODE_CLIENT); - - // The packet has a mode of MODE_CLIENT, but process_pkt expects MODE_SERVER - - EXPECT_EQ(SERVER_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -/* Tests bug 1597 */ -TEST_F(packetProcessingTest, KoDRate) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.stratum = STRATUM_PKT_UNSPEC; - memcpy(&testpkt.refid, "RATE", 4); - - EXPECT_EQ(KOD_RATE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, KoDDeny) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.stratum = STRATUM_PKT_UNSPEC; - memcpy(&testpkt.refid, "DENY", 4); - - EXPECT_EQ(KOD_DEMOBILIZE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, RejectUnsyncedServer) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC, - NTP_VERSION, - MODE_SERVER); - - EXPECT_EQ(SERVER_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, RejectWrongResponseServerMode) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - l_fp tmp; - tmp.l_ui = 1000UL; - tmp.l_uf = 0UL; - HTONL_FP(&tmp, &testpkt.org); - - tmp.l_ui = 2000UL; - tmp.l_uf = 0UL; - HTONL_FP(&tmp, &testspkt.xmt); - - EXPECT_EQ(PACKET_UNUSEABLE, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, AcceptNoSentPacketBroadcastMode) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, - NTP_VERSION, - MODE_BROADCAST); - - EXPECT_EQ(LEN_PKT_NOMAC, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_BROADCAST, NULL, "UnitTest")); -} - -TEST_F(packetProcessingTest, CorrectUnauthenticatedPacket) { - ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); - - EXPECT_EQ(LEN_PKT_NOMAC, - process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC, - MODE_SERVER, &testspkt, "UnitTest")); -} - -TEST_F(packetProcessingTest, CorrectAuthenticatedPacketMD5) { - PrepareAuthenticationTest(10, 15, "123456789abcdef"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - int pkt_len = LEN_PKT_NOMAC; - - // Prepare the packet. - testpkt.exten[0] = htonl(10); - int mac_len = make_mac((char*)&testpkt, pkt_len, - MAX_MD5_LEN, key_ptr, - (char*)&testpkt.exten[1]); - - pkt_len += 4 + mac_len; - - EXPECT_EQ(pkt_len, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); - -} - -TEST_F(packetProcessingTest, CorrectAuthenticatedPacketSHA1) { - PrepareAuthenticationTest(20, 15, "SHA1", "abcdefghijklmno"); - ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); - - int pkt_len = LEN_PKT_NOMAC; - - // Prepare the packet. - testpkt.exten[0] = htonl(20); - int mac_len = make_mac((char*)&testpkt, pkt_len, - MAX_MAC_LEN, key_ptr, - (char*)&testpkt.exten[1]); - - pkt_len += 4 + mac_len; - - EXPECT_EQ(pkt_len, - process_pkt(&testpkt, &testsock, pkt_len, - MODE_SERVER, &testspkt, "UnitTest")); -} diff --git a/contrib/ntp/sntp/tests/g_sntptest.h b/contrib/ntp/sntp/tests/g_sntptest.h deleted file mode 100644 index d5add9c..0000000 --- a/contrib/ntp/sntp/tests/g_sntptest.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef SNTPTEST_H -#define SNTPTEST_H - -#include "tests_main.h" - -extern "C" { -#include "ntp_stdlib.h" -#include "sntp-opts.h" -}; - -class sntptest : public ntptest { -protected: - sntptest() { - optionSaveState(&sntpOptions); - } - - ~sntptest() { - optionRestore(&sntpOptions); - } - - void ActivateOption(const char* option, const char* argument) { - const int ARGV_SIZE = 4; - - char* opts[ARGV_SIZE]; - - opts[0] = estrdup("sntpopts"); - opts[1] = estrdup(option); - opts[2] = estrdup(argument); - opts[3] = estrdup("127.0.0.1"); - - optionProcess(&sntpOptions, ARGV_SIZE, opts); - } -}; - -#endif // SNTPTEST_H diff --git a/contrib/ntp/sntp/tests/keyFile.c b/contrib/ntp/sntp/tests/keyFile.c index 3769947..77dfee7 100644 --- a/contrib/ntp/sntp/tests/keyFile.c +++ b/contrib/ntp/sntp/tests/keyFile.c @@ -7,10 +7,17 @@ #include "unity.h" -//typedef int bool; +bool CompareKeys(struct key expected, struct key actual); +bool CompareKeysAlternative(int key_id,int key_len,const char* type,const char* key_seq,struct key actual); +void test_ReadEmptyKeyFile(void); +void test_ReadASCIIKeys(void); +void test_ReadHexKeys(void); +void test_ReadKeyFileWithComments(void); +void test_ReadKeyFileWithInvalidHex(void); -bool CompareKeys(struct key expected, struct key actual) { +bool +CompareKeys(struct key expected, struct key actual) { if (expected.key_id != actual.key_id){ printf("Expected key_id: %d", expected.key_id); printf(" but was: %d\n", actual.key_id); @@ -34,7 +41,9 @@ bool CompareKeys(struct key expected, struct key actual) { return TRUE; } -bool CompareKeysAlternative(int key_id, + +bool +CompareKeysAlternative(int key_id, int key_len, const char* type, const char* key_seq, @@ -50,91 +59,99 @@ bool CompareKeysAlternative(int key_id, } -void test_ReadEmptyKeyFile() { +void +test_ReadEmptyKeyFile(void) { struct key* keys = NULL; TEST_ASSERT_EQUAL(0, auth_init(CreatePath("key-test-empty", INPUT_DIR), &keys)); - - TEST_ASSERT_TRUE(keys == NULL); + TEST_ASSERT_NULL(keys); } -void test_ReadASCIIKeys() { + +void +test_ReadASCIIKeys(void) { struct key* keys = NULL; TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-ascii", INPUT_DIR), &keys)); - TEST_ASSERT_TRUE(keys != NULL); + TEST_ASSERT_NOT_NULL(keys); struct key* result = NULL; get_key(40, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); TEST_ASSERT_TRUE(CompareKeysAlternative(40, 11, "MD5", "asciikeyTwo", *result)); result = NULL; get_key(50, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); TEST_ASSERT_TRUE(CompareKeysAlternative(50, 11, "MD5", "asciikeyOne", *result)); } -void test_ReadHexKeys() { + +void +test_ReadHexKeys(void) { struct key* keys = NULL; TEST_ASSERT_EQUAL(3, auth_init(CreatePath("key-test-hex", INPUT_DIR), &keys)); - TEST_ASSERT_TRUE(keys != NULL); + TEST_ASSERT_NOT_NULL(keys); struct key* result = NULL; get_key(10, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); TEST_ASSERT_TRUE(CompareKeysAlternative(10, 13, "MD5", "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89", *result)); result = NULL; get_key(20, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); char data1[15]; memset(data1, 0x11, 15); TEST_ASSERT_TRUE(CompareKeysAlternative(20, 15, "MD5", data1, *result)); result = NULL; get_key(30, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); char data2[13]; memset(data2, 0x01, 13); TEST_ASSERT_TRUE(CompareKeysAlternative(30, 13, "MD5", data2, *result)); } -void test_ReadKeyFileWithComments() { + +void +test_ReadKeyFileWithComments(void) { struct key* keys = NULL; TEST_ASSERT_EQUAL(2, auth_init(CreatePath("key-test-comments", INPUT_DIR), &keys)); - TEST_ASSERT_TRUE(keys != NULL); + TEST_ASSERT_NOT_NULL(keys); struct key* result = NULL; get_key(10, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); char data[15]; memset(data, 0x01, 15); TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result)); result = NULL; get_key(34, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); TEST_ASSERT_TRUE(CompareKeysAlternative(34, 3, "MD5", "xyz", *result)); } -void test_ReadKeyFileWithInvalidHex() { + +void +test_ReadKeyFileWithInvalidHex(void) { struct key* keys = NULL; TEST_ASSERT_EQUAL(1, auth_init(CreatePath("key-test-invalid-hex", INPUT_DIR), &keys)); - TEST_ASSERT_TRUE(keys != NULL); + TEST_ASSERT_NOT_NULL(keys); struct key* result = NULL; get_key(10, &result); - TEST_ASSERT_TRUE(result != NULL); + TEST_ASSERT_NOT_NULL(result); char data[15]; memset(data, 0x01, 15); TEST_ASSERT_TRUE(CompareKeysAlternative(10, 15, "MD5", data, *result)); result = NULL; get_key(30, &result); // Should not exist, and result should remain NULL. - TEST_ASSERT_TRUE(result == NULL); + TEST_ASSERT_NULL(result); } diff --git a/contrib/ntp/sntp/tests/kodDatabase.c b/contrib/ntp/sntp/tests/kodDatabase.c index a6b86d0..0c3615d 100644 --- a/contrib/ntp/sntp/tests/kodDatabase.c +++ b/contrib/ntp/sntp/tests/kodDatabase.c @@ -4,24 +4,29 @@ #include "sntptest.h" #include "ntp_stdlib.h" #include "sntp-opts.h" - #include "kod_management.h" +#include "ntp_io.h" #include "unity.h" -void setUp(void) -{ - kod_init_kod_db("/dev/null", TRUE); -} +void setUp(void); +void test_SingleEntryHandling(void); +void test_MultipleEntryHandling(void); +void test_NoMatchInSearch(void); +void test_AddDuplicate(void); +void test_DeleteEntry(void); -void tearDown(void) -{ + +void +setUp(void) { + kod_init_kod_db("/dev/null", TRUE); } -void test_SingleEntryHandling() { - char HOST[] = "192.0.2.5"; - char REASON[] = "DENY"; +void +test_SingleEntryHandling(void) { + const char HOST[] = "192.0.2.5"; + const char REASON[] = "DENY"; add_entry(HOST, REASON); @@ -32,15 +37,17 @@ void test_SingleEntryHandling() { TEST_ASSERT_EQUAL_STRING(REASON, result->type); } -void test_MultipleEntryHandling() { - char HOST1[] = "192.0.2.3"; - char REASON1[] = "DENY"; - char HOST2[] = "192.0.5.5"; - char REASON2[] = "RATE"; +void +test_MultipleEntryHandling(void) { + const char HOST1[] = "192.0.2.3"; + const char REASON1[] = "DENY"; - char HOST3[] = "192.0.10.1"; - char REASON3[] = "DENY"; + const char HOST2[] = "192.0.5.5"; + const char REASON2[] = "RATE"; + + const char HOST3[] = "192.0.10.1"; + const char REASON3[] = "DENY"; add_entry(HOST1, REASON1); add_entry(HOST2, REASON2); @@ -63,10 +70,12 @@ void test_MultipleEntryHandling() { free(result); } -void test_NoMatchInSearch() { - char HOST_ADD[] = "192.0.2.6"; - char HOST_NOTADD[] = "192.0.6.1"; - char REASON[] = "DENY"; + +void +test_NoMatchInSearch(void) { + const char HOST_ADD[] = "192.0.2.6"; + const char HOST_NOTADD[] = "192.0.6.1"; + const char REASON[] = "DENY"; add_entry(HOST_ADD, REASON); @@ -76,10 +85,12 @@ void test_NoMatchInSearch() { TEST_ASSERT_TRUE(result == NULL); } -void test_AddDuplicate() { - char HOST[] = "192.0.2.3"; - char REASON1[] = "RATE"; - char REASON2[] = "DENY"; + +void +test_AddDuplicate(void) { + const char HOST[] = "192.0.2.3"; + const char REASON1[] = "RATE"; + const char REASON2[] = "DENY"; add_entry(HOST, REASON1); struct kod_entry* result1; @@ -101,11 +112,13 @@ void test_AddDuplicate() { free(result2); } -void test_DeleteEntry() { - char HOST1[] = "192.0.2.1"; - char HOST2[] = "192.0.2.2"; - char HOST3[] = "192.0.2.3"; - char REASON[] = "DENY"; + +void +test_DeleteEntry(void) { + const char HOST1[] = "192.0.2.1"; + const char HOST2[] = "192.0.2.2"; + const char HOST3[] = "192.0.2.3"; + const char REASON[] = "DENY"; add_entry(HOST1, REASON); add_entry(HOST2, REASON); diff --git a/contrib/ntp/sntp/tests/kodFile.c b/contrib/ntp/sntp/tests/kodFile.c index 7daec21..6eb0971 100644 --- a/contrib/ntp/sntp/tests/kodFile.c +++ b/contrib/ntp/sntp/tests/kodFile.c @@ -1,10 +1,8 @@ #include "config.h" + #include "ntp_types.h" #include "ntp_stdlib.h" // For estrdup() - - #include "fileHandlingTest.h" - #include "kod_management.h" #include "unity.h" @@ -17,22 +15,32 @@ extern int kod_db_cnt; extern struct kod_entry** kod_db; extern char* kod_db_file; -void setUp() { - kod_db_cnt = 0; - kod_db = NULL; -} +void setUp(void); +void test_ReadEmptyFile(void); +void test_ReadCorrectFile(void); +void test_ReadFileWithBlankLines(void); +void test_WriteEmptyFile(void); +void test_WriteFileWithSingleEntry(void); +void test_WriteFileWithMultipleEntries(void); + -void tearDown() { +void +setUp(void) { + kod_db_cnt = 0; + kod_db = NULL; } -void test_ReadEmptyFile() { +void +test_ReadEmptyFile(void) { kod_init_kod_db(CreatePath("kod-test-empty", INPUT_DIR), TRUE); TEST_ASSERT_EQUAL(0, kod_db_cnt); } -void test_ReadCorrectFile() { + +void +test_ReadCorrectFile(void) { kod_init_kod_db(CreatePath("kod-test-correct", INPUT_DIR), TRUE); TEST_ASSERT_EQUAL(2, kod_db_cnt); @@ -50,7 +58,9 @@ void test_ReadCorrectFile() { TEST_ASSERT_EQUAL(0xfff, res->timestamp); } -void test_ReadFileWithBlankLines() { + +void +test_ReadFileWithBlankLines(void) { kod_init_kod_db(CreatePath("kod-test-blanks", INPUT_DIR), TRUE); TEST_ASSERT_EQUAL(3, kod_db_cnt); @@ -73,31 +83,30 @@ void test_ReadFileWithBlankLines() { TEST_ASSERT_EQUAL(0xabcd, res->timestamp); } -void test_WriteEmptyFile() { - //kod_db_file = estrdup(CreatePath("kod-output-blank", OUTPUT_DIR)); //causing issues on psp-at1, replaced + +void +test_WriteEmptyFile(void) { kod_db_file = estrdup("kod-output-blank"); - //printf("kod PATH: %s\n",kod_db_file); write_kod_db(); // Open file and ensure that the filesize is 0 bytes. - FILE * is; - is = fopen(kod_db_file, "rb");//std::ios::binary); - TEST_ASSERT_FALSE(is == NULL );//is.fail()); - + FILE * is = fopen(kod_db_file, "rb"); + TEST_ASSERT_NOT_NULL(is); + TEST_ASSERT_EQUAL(0, GetFileSize(is)); fclose(is); } -void test_WriteFileWithSingleEntry() { - //kod_db_file = estrdup(CreatePath("kod-output-single", OUTPUT_DIR)); //causing issues on psp-at1, replaced + +void +test_WriteFileWithSingleEntry(void) { kod_db_file = estrdup("kod-output-single"); - //printf("kod PATH: %s\n",kod_db_file); add_entry("host1", "DENY"); // Here we must manipulate the timestamps, so they match the one in // the expected file. - // + kod_db[0]->timestamp = 1; write_kod_db(); @@ -105,18 +114,19 @@ void test_WriteFileWithSingleEntry() { // Open file and compare sizes. FILE * actual = fopen(kod_db_file, "rb"); FILE * expected = fopen(CreatePath("kod-expected-single", INPUT_DIR),"rb"); - TEST_ASSERT_TRUE(actual !=NULL);//TEST_ASSERT_TRUE(actual.good()); - TEST_ASSERT_TRUE(expected !=NULL);//TEST_ASSERT_TRUE(expected.good()); - TEST_ASSERT_EQUAL(GetFileSize(expected), GetFileSize(actual)); + TEST_ASSERT_NOT_NULL(actual); + TEST_ASSERT_NOT_NULL(expected); + TEST_ASSERT_EQUAL(GetFileSize(expected), GetFileSize(actual)); + TEST_ASSERT_TRUE(CompareFileContent(expected, actual)); } -void test_WriteFileWithMultipleEntries() { - //kod_db_file = estrdup(CreatePath("kod-output-multiple", OUTPUT_DIR)); //causing issues on psp-at1, replaced + +void +test_WriteFileWithMultipleEntries(void) { kod_db_file = estrdup("kod-output-multiple"); - //printf("kod PATH: %s\n",kod_db_file); add_entry("example.com", "RATE"); add_entry("192.0.2.1", "DENY"); add_entry("192.0.2.5", "RSTR"); @@ -134,12 +144,12 @@ void test_WriteFileWithMultipleEntries() { // Open file and compare sizes and content. FILE * actual = fopen(kod_db_file, "rb"); FILE * expected = fopen(CreatePath("kod-expected-multiple", INPUT_DIR),"rb"); - TEST_ASSERT_TRUE(actual !=NULL);//TEST_ASSERT_TRUE(actual.good()); - TEST_ASSERT_TRUE(expected !=NULL);//TEST_ASSERT_TRUE(expected.good()); - + TEST_ASSERT_NOT_NULL(actual); + TEST_ASSERT_NOT_NULL(expected); + + TEST_ASSERT_EQUAL(GetFileSize(expected), GetFileSize(actual)); TEST_ASSERT_TRUE(CompareFileContent(expected, actual)); } - diff --git a/contrib/ntp/sntp/tests/packetHandling.c b/contrib/ntp/sntp/tests/packetHandling.c index 4cb5a91..1036fc3 100644 --- a/contrib/ntp/sntp/tests/packetHandling.c +++ b/contrib/ntp/sntp/tests/packetHandling.c @@ -12,27 +12,37 @@ #include "unity.h" - -int counter = 0; - - -// old code from google test framework, moved to SetUp() for unity -void setUp(void) -{ +void setUp(void); +int LfpEquality(const l_fp expected, const l_fp actual); +void test_GenerateUnauthenticatedPacket(void); +void test_GenerateAuthenticatedPacket(void); +void test_OffsetCalculationPositiveOffset(void); +void test_OffsetCalculationNegativeOffset(void); +void test_HandleUnusableServer(void); +void test_HandleUnusablePacket(void); +void test_HandleServerAuthenticationFailure(void); +void test_HandleKodDemobilize(void); +void test_HandleKodRate(void); +void test_HandleCorrectPacket(void); + + +void +setUp(void) { init_lib(); } - -int LfpEquality(const l_fp expected, const l_fp actual) { - if (L_ISEQU(&expected, &actual)) { - return TRUE; - } else { - return FALSE; - } +int +LfpEquality(const l_fp expected, const l_fp actual) { + if (L_ISEQU(&expected, &actual)) + return TRUE; + else + return FALSE; } -void test_GenerateUnauthenticatedPacket(void) { + +void +test_GenerateUnauthenticatedPacket(void) { struct pkt testpkt; struct timeval xmt; @@ -55,7 +65,9 @@ void test_GenerateUnauthenticatedPacket(void) { TEST_ASSERT_TRUE(LfpEquality(expected_xmt, actual_xmt)); } -void test_GenerateAuthenticatedPacket(void) { + +void +test_GenerateAuthenticatedPacket(void) { struct key testkey; testkey.next = NULL; testkey.key_id = 30; @@ -91,10 +103,12 @@ void test_GenerateAuthenticatedPacket(void) { char expected_mac[MAX_MD5_LEN]; TEST_ASSERT_EQUAL(MAX_MD5_LEN - 4, // Remove the key_id, only keep the mac. make_mac((char*)&testpkt, LEN_PKT_NOMAC, MAX_MD5_LEN, &testkey, expected_mac)); - TEST_ASSERT_TRUE(memcmp(expected_mac, (char*)&testpkt.exten[1], MAX_MD5_LEN -4) == 0); + TEST_ASSERT_EQUAL_MEMORY(expected_mac, (char*)&testpkt.exten[1], MAX_MD5_LEN -4); } -void test_OffsetCalculationPositiveOffset(void) { + +void +test_OffsetCalculationPositiveOffset(void) { struct pkt rpkt; rpkt.precision = -16; // 0,000015259 @@ -132,13 +146,15 @@ void test_OffsetCalculationPositiveOffset(void) { double offset, precision, synch_distance; offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance); - TEST_ASSERT_EQUAL_FLOAT(1.25, offset); - TEST_ASSERT_EQUAL_FLOAT(1. / ULOGTOD(16), precision); + TEST_ASSERT_EQUAL_DOUBLE(1.25, offset); + TEST_ASSERT_EQUAL_DOUBLE(1. / ULOGTOD(16), precision); // 1.1250150000000001 ? - TEST_ASSERT_EQUAL_FLOAT(1.125015, synch_distance); + TEST_ASSERT_EQUAL_DOUBLE(1.125015, synch_distance); } -void test_OffsetCalculationNegativeOffset(void) { + +void +test_OffsetCalculationNegativeOffset(void) { struct pkt rpkt; rpkt.precision = -1; @@ -176,12 +192,14 @@ void test_OffsetCalculationNegativeOffset(void) { double offset, precision, synch_distance; offset_calculation(&rpkt, LEN_PKT_NOMAC, &dst, &offset, &precision, &synch_distance); - TEST_ASSERT_EQUAL_FLOAT(-1, offset); - TEST_ASSERT_EQUAL_FLOAT(1. / ULOGTOD(1), precision); - TEST_ASSERT_EQUAL_FLOAT(1.3333483333333334, synch_distance); + TEST_ASSERT_EQUAL_DOUBLE(-1, offset); + TEST_ASSERT_EQUAL_DOUBLE(1. / ULOGTOD(1), precision); + TEST_ASSERT_EQUAL_DOUBLE(1.3333483333333334, synch_distance); } -void test_HandleUnusableServer(void) { + +void +test_HandleUnusableServer(void) { struct pkt rpkt; sockaddr_u host; int rpktl; @@ -192,7 +210,9 @@ void test_HandleUnusableServer(void) { TEST_ASSERT_EQUAL(-1, handle_pkt(rpktl, &rpkt, &host, "")); } -void test_HandleUnusablePacket(void) { + +void +test_HandleUnusablePacket(void) { struct pkt rpkt; sockaddr_u host; int rpktl; @@ -203,7 +223,9 @@ void test_HandleUnusablePacket(void) { TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, "")); } -void test_HandleServerAuthenticationFailure(void) { + +void +test_HandleServerAuthenticationFailure(void) { struct pkt rpkt; sockaddr_u host; int rpktl; @@ -214,7 +236,9 @@ void test_HandleServerAuthenticationFailure(void) { TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, "")); } -void test_HandleKodDemobilize(void) { + +void +test_HandleKodDemobilize(void) { const char * HOSTNAME = "192.0.2.1"; const char * REASON = "DENY"; struct pkt rpkt; @@ -235,10 +259,12 @@ void test_HandleKodDemobilize(void) { TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, HOSTNAME)); TEST_ASSERT_EQUAL(1, search_entry(HOSTNAME, &entry)); - TEST_ASSERT_TRUE(memcmp(REASON, entry->type, 4) == 0); + TEST_ASSERT_EQUAL_MEMORY(REASON, entry->type, 4); } -void test_HandleKodRate(void) { + +void +test_HandleKodRate(void) { struct pkt rpkt; sockaddr_u host; int rpktl; @@ -249,7 +275,9 @@ void test_HandleKodRate(void) { TEST_ASSERT_EQUAL(1, handle_pkt(rpktl, &rpkt, &host, "")); } -void test_HandleCorrectPacket(void) { + +void +test_HandleCorrectPacket(void) { struct pkt rpkt; sockaddr_u host; int rpktl; diff --git a/contrib/ntp/sntp/tests/packetProcessing.c b/contrib/ntp/sntp/tests/packetProcessing.c index 27ab72e..1fd649e 100644 --- a/contrib/ntp/sntp/tests/packetProcessing.c +++ b/contrib/ntp/sntp/tests/packetProcessing.c @@ -4,6 +4,7 @@ #include "ntp_stdlib.h" #include "unity.h" + const char * Version = "stub unit test Version string"; // Hacks into the key database. @@ -11,21 +12,47 @@ extern struct key* key_ptr; extern int key_cnt; +void PrepareAuthenticationTest(int key_id,int key_len,const char* type,const void* key_seq); +void PrepareAuthenticationTestMD5(int key_id,int key_len,const void* key_seq); +void setUp(void); +void tearDown(void); +void test_TooShortLength(void); +void test_LengthNotMultipleOfFour(void); +void test_TooShortExtensionFieldLength(void); +void test_UnauthenticatedPacketReject(void); +void test_CryptoNAKPacketReject(void); +void test_AuthenticatedPacketInvalid(void); +void test_AuthenticatedPacketUnknownKey(void); +void test_ServerVersionTooOld(void); +void test_ServerVersionTooNew(void); +void test_NonWantedMode(void); +void test_KoDRate(void); +void test_KoDDeny(void); +void test_RejectUnsyncedServer(void); +void test_RejectWrongResponseServerMode(void); +void test_AcceptNoSentPacketBroadcastMode(void); +void test_CorrectUnauthenticatedPacket(void); +void test_CorrectAuthenticatedPacketMD5(void); +void test_CorrectAuthenticatedPacketSHA1(void); + + static struct pkt testpkt; static struct pkt testspkt; static sockaddr_u testsock; bool restoreKeyDb; -void PrepareAuthenticationTest(int key_id, + +void +PrepareAuthenticationTest(int key_id, int key_len, const char* type, const void* key_seq) { char str[25]; - sprintf(str, "%d", key_id); + snprintf(str, 25, "%d", key_id); ActivateOption("-a", str); key_cnt = 1; - key_ptr = malloc(sizeof(struct key)); + key_ptr = emalloc(sizeof(struct key)); key_ptr->next = NULL; key_ptr->key_id = key_id; key_ptr->key_len = key_len; @@ -37,13 +64,17 @@ void PrepareAuthenticationTest(int key_id, restoreKeyDb = true; } -void PrepareAuthenticationTestMD5(int key_id, + +void +PrepareAuthenticationTestMD5(int key_id, int key_len, const void* key_seq) { PrepareAuthenticationTest(key_id, key_len, "MD5", key_seq); } -void setUp() { + +void +setUp(void) { sntptest(); restoreKeyDb = false; @@ -63,10 +94,11 @@ void setUp() { HTONL_FP(&tmp, &testpkt.org); HTONL_FP(&tmp, &testspkt.xmt); - } -void tearDown() { + +void +tearDown(void) { if (restoreKeyDb) { key_cnt = 0; @@ -75,12 +107,12 @@ void tearDown() { } sntptest_destroy(); //only on the final test!! if counter == 0 etc... - } -void test_TooShortLength(void) { +void +test_TooShortLength(void) { TEST_ASSERT_EQUAL(PACKET_UNUSEABLE, process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC - 1, MODE_SERVER, &testspkt, "UnitTest")); @@ -89,7 +121,9 @@ void test_TooShortLength(void) { MODE_BROADCAST, &testspkt, "UnitTest")); } -void test_LengthNotMultipleOfFour(void) { + +void +test_LengthNotMultipleOfFour(void) { TEST_ASSERT_EQUAL(PACKET_UNUSEABLE, process_pkt(&testpkt, &testsock, LEN_PKT_NOMAC + 6, MODE_SERVER, &testspkt, "UnitTest")); @@ -98,7 +132,9 @@ void test_LengthNotMultipleOfFour(void) { MODE_BROADCAST, &testspkt, "UnitTest")); } -void test_TooShortExtensionFieldLength(void) { + +void +test_TooShortExtensionFieldLength(void) { /* The lower 16-bits are the length of the extension field. * This lengths must be multiples of 4 bytes, which gives * a minimum of 4 byte extension field length. */ @@ -114,7 +150,9 @@ void test_TooShortExtensionFieldLength(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_UnauthenticatedPacketReject(void) { + +void +test_UnauthenticatedPacketReject(void) { //sntptest(); // Activate authentication option ActivateOption("-a", "123"); @@ -128,7 +166,9 @@ void test_UnauthenticatedPacketReject(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_CryptoNAKPacketReject(void) { + +void +test_CryptoNAKPacketReject(void) { // Activate authentication option ActivateOption("-a", "123"); TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); @@ -140,7 +180,9 @@ void test_CryptoNAKPacketReject(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_AuthenticatedPacketInvalid(void) { + +void +test_AuthenticatedPacketInvalid(void) { // Activate authentication option PrepareAuthenticationTestMD5(50, 9, "123456789"); TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); @@ -163,7 +205,9 @@ void test_AuthenticatedPacketInvalid(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_AuthenticatedPacketUnknownKey(void) { + +void +test_AuthenticatedPacketUnknownKey(void) { // Activate authentication option PrepareAuthenticationTestMD5(30, 9, "123456789"); TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); @@ -183,7 +227,9 @@ void test_AuthenticatedPacketUnknownKey(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_ServerVersionTooOld(void) { + +void +test_ServerVersionTooOld(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, @@ -198,7 +244,9 @@ void test_ServerVersionTooOld(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_ServerVersionTooNew(void) { + +void +test_ServerVersionTooNew(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, @@ -213,7 +261,9 @@ void test_ServerVersionTooNew(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_NonWantedMode(void) { + +void +test_NonWantedMode(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, @@ -227,8 +277,10 @@ void test_NonWantedMode(void) { MODE_SERVER, &testspkt, "UnitTest")); } + /* Tests bug 1597 */ -void test_KoDRate(void) { +void +test_KoDRate(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.stratum = STRATUM_PKT_UNSPEC; @@ -239,7 +291,9 @@ void test_KoDRate(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_KoDDeny(void) { + +void +test_KoDDeny(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.stratum = STRATUM_PKT_UNSPEC; @@ -250,7 +304,9 @@ void test_KoDDeny(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_RejectUnsyncedServer(void) { + +void +test_RejectUnsyncedServer(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC, @@ -262,7 +318,9 @@ void test_RejectUnsyncedServer(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_RejectWrongResponseServerMode(void) { + +void +test_RejectWrongResponseServerMode(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); l_fp tmp; @@ -279,7 +337,9 @@ void test_RejectWrongResponseServerMode(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_AcceptNoSentPacketBroadcastMode(void) { + +void +test_AcceptNoSentPacketBroadcastMode(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); testpkt.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, @@ -291,7 +351,9 @@ void test_AcceptNoSentPacketBroadcastMode(void) { MODE_BROADCAST, NULL, "UnitTest")); } -void test_CorrectUnauthenticatedPacket(void) { + +void +test_CorrectUnauthenticatedPacket(void) { TEST_ASSERT_FALSE(ENABLED_OPT(AUTHENTICATION)); TEST_ASSERT_EQUAL(LEN_PKT_NOMAC, @@ -299,7 +361,9 @@ void test_CorrectUnauthenticatedPacket(void) { MODE_SERVER, &testspkt, "UnitTest")); } -void test_CorrectAuthenticatedPacketMD5(void) { + +void +test_CorrectAuthenticatedPacketMD5(void) { PrepareAuthenticationTestMD5(10, 15, "123456789abcdef"); TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); @@ -319,7 +383,9 @@ void test_CorrectAuthenticatedPacketMD5(void) { } -void test_CorrectAuthenticatedPacketSHA1(void) { + +void +test_CorrectAuthenticatedPacketSHA1(void) { PrepareAuthenticationTest(20, 15, "SHA1", "abcdefghijklmno"); TEST_ASSERT_TRUE(ENABLED_OPT(AUTHENTICATION)); diff --git a/contrib/ntp/sntp/tests/run-crypto.c b/contrib/ntp/sntp/tests/run-crypto.c index c5dbaf6..8b2a735 100644 --- a/contrib/ntp/sntp/tests/run-crypto.c +++ b/contrib/ntp/sntp/tests/run-crypto.c @@ -22,11 +22,14 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "ntp_types.h" +#include "sntptest.h" +#include "crypto.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_MakeMd5Mac(void); extern void test_MakeSHA1Mac(void); extern void test_VerifyCorrectMD5(void); @@ -36,27 +39,27 @@ extern void test_PacketSizeNotMultipleOfFourBytes(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "crypto.c"; UnityBegin("crypto.c"); - RUN_TEST(test_MakeMd5Mac, 11); - RUN_TEST(test_MakeSHA1Mac, 33); - RUN_TEST(test_VerifyCorrectMD5, 59); - RUN_TEST(test_VerifySHA1, 78); - RUN_TEST(test_VerifyFailure, 100); - RUN_TEST(test_PacketSizeNotMultipleOfFourBytes, 120); + RUN_TEST(test_MakeMd5Mac, 12); + RUN_TEST(test_MakeSHA1Mac, 13); + RUN_TEST(test_VerifyCorrectMD5, 14); + RUN_TEST(test_VerifySHA1, 15); + RUN_TEST(test_VerifyFailure, 16); + RUN_TEST(test_PacketSizeNotMultipleOfFourBytes, 17); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-keyFile.c b/contrib/ntp/sntp/tests/run-keyFile.c index 0a6380d..8629109 100644 --- a/contrib/ntp/sntp/tests/run-keyFile.c +++ b/contrib/ntp/sntp/tests/run-keyFile.c @@ -22,38 +22,43 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "fileHandlingTest.h" +#include "ntp_stdlib.h" +#include "ntp_types.h" +#include "crypto.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -extern void test_ReadEmptyKeyFile(); -extern void test_ReadASCIIKeys(); -extern void test_ReadHexKeys(); -extern void test_ReadKeyFileWithComments(); -extern void test_ReadKeyFileWithInvalidHex(); +extern void test_ReadEmptyKeyFile(void); +extern void test_ReadASCIIKeys(void); +extern void test_ReadHexKeys(void); +extern void test_ReadKeyFileWithComments(void); +extern void test_ReadKeyFileWithInvalidHex(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "keyFile.c"; UnityBegin("keyFile.c"); - RUN_TEST(test_ReadEmptyKeyFile, 53); - RUN_TEST(test_ReadASCIIKeys, 61); - RUN_TEST(test_ReadHexKeys, 79); - RUN_TEST(test_ReadKeyFileWithComments, 105); - RUN_TEST(test_ReadKeyFileWithInvalidHex, 124); + RUN_TEST(test_ReadEmptyKeyFile, 12); + RUN_TEST(test_ReadASCIIKeys, 13); + RUN_TEST(test_ReadHexKeys, 14); + RUN_TEST(test_ReadKeyFileWithComments, 15); + RUN_TEST(test_ReadKeyFileWithInvalidHex, 16); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-kodDatabase.c b/contrib/ntp/sntp/tests/run-kodDatabase.c index 7fc9678..e5bf3d7 100644 --- a/contrib/ntp/sntp/tests/run-kodDatabase.c +++ b/contrib/ntp/sntp/tests/run-kodDatabase.c @@ -22,38 +22,45 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "ntp_types.h" +#include "sntptest.h" +#include "ntp_stdlib.h" +#include "sntp-opts.h" +#include "kod_management.h" +#include "ntp_io.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -extern void test_SingleEntryHandling(); -extern void test_MultipleEntryHandling(); -extern void test_NoMatchInSearch(); -extern void test_AddDuplicate(); -extern void test_DeleteEntry(); +extern void test_SingleEntryHandling(void); +extern void test_MultipleEntryHandling(void); +extern void test_NoMatchInSearch(void); +extern void test_AddDuplicate(void); +extern void test_DeleteEntry(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "kodDatabase.c"; UnityBegin("kodDatabase.c"); - RUN_TEST(test_SingleEntryHandling, 22); - RUN_TEST(test_MultipleEntryHandling, 35); - RUN_TEST(test_NoMatchInSearch, 66); - RUN_TEST(test_AddDuplicate, 79); - RUN_TEST(test_DeleteEntry, 104); + RUN_TEST(test_SingleEntryHandling, 13); + RUN_TEST(test_MultipleEntryHandling, 14); + RUN_TEST(test_NoMatchInSearch, 15); + RUN_TEST(test_AddDuplicate, 16); + RUN_TEST(test_DeleteEntry, 17); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-kodFile.c b/contrib/ntp/sntp/tests/run-kodFile.c index 9c58962..3943550 100644 --- a/contrib/ntp/sntp/tests/run-kodFile.c +++ b/contrib/ntp/sntp/tests/run-kodFile.c @@ -22,40 +22,45 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "ntp_types.h" +#include "ntp_stdlib.h" +#include "fileHandlingTest.h" +#include "kod_management.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -extern void test_ReadEmptyFile(); -extern void test_ReadCorrectFile(); -extern void test_ReadFileWithBlankLines(); -extern void test_WriteEmptyFile(); -extern void test_WriteFileWithSingleEntry(); -extern void test_WriteFileWithMultipleEntries(); +extern void test_ReadEmptyFile(void); +extern void test_ReadCorrectFile(void); +extern void test_ReadFileWithBlankLines(void); +extern void test_WriteEmptyFile(void); +extern void test_WriteFileWithSingleEntry(void); +extern void test_WriteFileWithMultipleEntries(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "kodFile.c"; UnityBegin("kodFile.c"); - RUN_TEST(test_ReadEmptyFile, 29); - RUN_TEST(test_ReadCorrectFile, 35); - RUN_TEST(test_ReadFileWithBlankLines, 53); - RUN_TEST(test_WriteEmptyFile, 76); - RUN_TEST(test_WriteFileWithSingleEntry, 92); - RUN_TEST(test_WriteFileWithMultipleEntries, 116); + RUN_TEST(test_ReadEmptyFile, 19); + RUN_TEST(test_ReadCorrectFile, 20); + RUN_TEST(test_ReadFileWithBlankLines, 21); + RUN_TEST(test_WriteEmptyFile, 22); + RUN_TEST(test_WriteFileWithSingleEntry, 23); + RUN_TEST(test_WriteFileWithMultipleEntries, 24); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-networking.c b/contrib/ntp/sntp/tests/run-networking.c index d5e822c..70caaa0 100644 --- a/contrib/ntp/sntp/tests/run-networking.c +++ b/contrib/ntp/sntp/tests/run-networking.c @@ -22,6 +22,9 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "sntptest.h" +#include "networking.h" //=======External Functions This Runner Calls===== extern void setUp(void); @@ -29,20 +32,20 @@ extern void tearDown(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "networking.c"; UnityBegin("networking.c"); return (UnityEnd()); diff --git a/contrib/ntp/sntp/tests/run-packetHandling.c b/contrib/ntp/sntp/tests/run-packetHandling.c index 69e958e..bc20d7f 100644 --- a/contrib/ntp/sntp/tests/run-packetHandling.c +++ b/contrib/ntp/sntp/tests/run-packetHandling.c @@ -22,11 +22,19 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "ntp_debug.h" +#include "ntp_stdlib.h" +#include "ntp_types.h" +#include "sntptest.h" +#include "kod_management.h" +#include "main.h" +#include "networking.h" +#include "ntp.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_GenerateUnauthenticatedPacket(void); extern void test_GenerateAuthenticatedPacket(void); extern void test_OffsetCalculationPositiveOffset(void); @@ -40,31 +48,31 @@ extern void test_HandleCorrectPacket(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "packetHandling.c"; UnityBegin("packetHandling.c"); - RUN_TEST(test_GenerateUnauthenticatedPacket, 35); - RUN_TEST(test_GenerateAuthenticatedPacket, 58); - RUN_TEST(test_OffsetCalculationPositiveOffset, 97); - RUN_TEST(test_OffsetCalculationNegativeOffset, 141); - RUN_TEST(test_HandleUnusableServer, 184); - RUN_TEST(test_HandleUnusablePacket, 195); - RUN_TEST(test_HandleServerAuthenticationFailure, 206); - RUN_TEST(test_HandleKodDemobilize, 217); - RUN_TEST(test_HandleKodRate, 241); - RUN_TEST(test_HandleCorrectPacket, 252); + RUN_TEST(test_GenerateUnauthenticatedPacket, 17); + RUN_TEST(test_GenerateAuthenticatedPacket, 18); + RUN_TEST(test_OffsetCalculationPositiveOffset, 19); + RUN_TEST(test_OffsetCalculationNegativeOffset, 20); + RUN_TEST(test_HandleUnusableServer, 21); + RUN_TEST(test_HandleUnusablePacket, 22); + RUN_TEST(test_HandleServerAuthenticationFailure, 23); + RUN_TEST(test_HandleKodDemobilize, 24); + RUN_TEST(test_HandleKodRate, 25); + RUN_TEST(test_HandleCorrectPacket, 26); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-packetProcessing.c b/contrib/ntp/sntp/tests/run-packetProcessing.c index f41d5c7..bf3a63e 100644 --- a/contrib/ntp/sntp/tests/run-packetProcessing.c +++ b/contrib/ntp/sntp/tests/run-packetProcessing.c @@ -22,11 +22,14 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "sntptest.h" +#include "networking.h" +#include "ntp_stdlib.h" //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); extern void test_TooShortLength(void); extern void test_LengthNotMultipleOfFour(void); extern void test_TooShortExtensionFieldLength(void); @@ -48,39 +51,39 @@ extern void test_CorrectAuthenticatedPacketSHA1(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "packetProcessing.c"; UnityBegin("packetProcessing.c"); - RUN_TEST(test_TooShortLength, 83); - RUN_TEST(test_LengthNotMultipleOfFour, 92); - RUN_TEST(test_TooShortExtensionFieldLength, 101); - RUN_TEST(test_UnauthenticatedPacketReject, 117); - RUN_TEST(test_CryptoNAKPacketReject, 131); - RUN_TEST(test_AuthenticatedPacketInvalid, 143); - RUN_TEST(test_AuthenticatedPacketUnknownKey, 166); - RUN_TEST(test_ServerVersionTooOld, 186); - RUN_TEST(test_ServerVersionTooNew, 201); - RUN_TEST(test_NonWantedMode, 216); - RUN_TEST(test_KoDRate, 231); - RUN_TEST(test_KoDDeny, 242); - RUN_TEST(test_RejectUnsyncedServer, 253); - RUN_TEST(test_RejectWrongResponseServerMode, 265); - RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 282); - RUN_TEST(test_CorrectUnauthenticatedPacket, 294); - RUN_TEST(test_CorrectAuthenticatedPacketMD5, 302); - RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 322); + RUN_TEST(test_TooShortLength, 19); + RUN_TEST(test_LengthNotMultipleOfFour, 20); + RUN_TEST(test_TooShortExtensionFieldLength, 21); + RUN_TEST(test_UnauthenticatedPacketReject, 22); + RUN_TEST(test_CryptoNAKPacketReject, 23); + RUN_TEST(test_AuthenticatedPacketInvalid, 24); + RUN_TEST(test_AuthenticatedPacketUnknownKey, 25); + RUN_TEST(test_ServerVersionTooOld, 26); + RUN_TEST(test_ServerVersionTooNew, 27); + RUN_TEST(test_NonWantedMode, 28); + RUN_TEST(test_KoDRate, 29); + RUN_TEST(test_KoDDeny, 30); + RUN_TEST(test_RejectUnsyncedServer, 31); + RUN_TEST(test_RejectWrongResponseServerMode, 32); + RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 33); + RUN_TEST(test_CorrectUnauthenticatedPacket, 34); + RUN_TEST(test_CorrectAuthenticatedPacketMD5, 35); + RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 36); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/run-t-log.c b/contrib/ntp/sntp/tests/run-t-log.c new file mode 100644 index 0000000..dc9fa04 --- /dev/null +++ b/contrib/ntp/sntp/tests/run-t-log.c @@ -0,0 +1,57 @@ +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include <setjmp.h> +#include <stdio.h> +#include "config.h" +#include "ntp_types.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void testChangePrognameInMysyslog(void); +extern void testOpenLogfileTest(void); +extern void testWriteInCustomLogfile(void); + + +//=======Test Reset Option===== +void resetTest(void); +void resetTest(void) +{ + tearDown(); + setUp(); +} + +char const *progname; + + +//=======MAIN===== +int main(int argc, char *argv[]) +{ + progname = argv[0]; + UnityBegin("t-log.c"); + RUN_TEST(testChangePrognameInMysyslog, 9); + RUN_TEST(testOpenLogfileTest, 10); + RUN_TEST(testWriteInCustomLogfile, 35); + + return (UnityEnd()); +} diff --git a/contrib/ntp/sntp/tests/run-utilities.c b/contrib/ntp/sntp/tests/run-utilities.c index 715bd11..7c2237b 100644 --- a/contrib/ntp/sntp/tests/run-utilities.c +++ b/contrib/ntp/sntp/tests/run-utilities.c @@ -22,43 +22,48 @@ #include "unity.h" #include <setjmp.h> #include <stdio.h> +#include "config.h" +#include "sntptest.h" +#include "fileHandlingTest.h" +#include "main.h" +#include "utilities.h" +#include <math.h> //=======External Functions This Runner Calls===== extern void setUp(void); extern void tearDown(void); -void resetTest(void); -extern void test_IPv4Address(); -extern void test_IPv6Address(); -extern void test_SetLiVnMode1(); -extern void test_SetLiVnMode2(); -extern void test_PktOutput(); -extern void test_LfpOutputBinaryFormat(); -extern void test_LfpOutputDecimalFormat(); +extern void test_IPv4Address(void); +extern void test_IPv6Address(void); +extern void test_SetLiVnMode1(void); +extern void test_SetLiVnMode2(void); +extern void test_PktOutput(void); +extern void test_LfpOutputBinaryFormat(void); +extern void test_LfpOutputDecimalFormat(void); //=======Test Reset Option===== -void resetTest() +void resetTest(void); +void resetTest(void) { tearDown(); setUp(); } -char *progname; +char const *progname; //=======MAIN===== int main(int argc, char *argv[]) { progname = argv[0]; - Unity.TestFile = "utilities.c"; UnityBegin("utilities.c"); - RUN_TEST(test_IPv4Address, 68); - RUN_TEST(test_IPv6Address, 78); - RUN_TEST(test_SetLiVnMode1, 98); - RUN_TEST(test_SetLiVnMode2, 111); - RUN_TEST(test_PktOutput, 126); - RUN_TEST(test_LfpOutputBinaryFormat, 146); - RUN_TEST(test_LfpOutputDecimalFormat, 162); + RUN_TEST(test_IPv4Address, 16); + RUN_TEST(test_IPv6Address, 17); + RUN_TEST(test_SetLiVnMode1, 18); + RUN_TEST(test_SetLiVnMode2, 19); + RUN_TEST(test_PktOutput, 20); + RUN_TEST(test_LfpOutputBinaryFormat, 21); + RUN_TEST(test_LfpOutputDecimalFormat, 22); return (UnityEnd()); } diff --git a/contrib/ntp/sntp/tests/sntptest.c b/contrib/ntp/sntp/tests/sntptest.c new file mode 100644 index 0000000..73c1ad2 --- /dev/null +++ b/contrib/ntp/sntp/tests/sntptest.c @@ -0,0 +1,33 @@ + +#include "config.h" +#include "ntp_stdlib.h" +#include "sntp-opts.h" +#include "sntptest.h" + +void +sntptest(void) { + optionSaveState(&sntpOptions); +} + + +void +sntptest_destroy(void) { + optionRestore(&sntpOptions); +} + + +void +ActivateOption(const char* option, const char* argument) { + + const int ARGV_SIZE = 4; + + char* opts[ARGV_SIZE]; + + opts[0] = estrdup("sntpopts"); + opts[1] = estrdup(option); + opts[2] = estrdup(argument); + opts[3] = estrdup("127.0.0.1"); + + optionProcess(&sntpOptions, ARGV_SIZE, opts); +} + diff --git a/contrib/ntp/sntp/tests/sntptest.h b/contrib/ntp/sntp/tests/sntptest.h index eff6f6e..82e2562 100644 --- a/contrib/ntp/sntp/tests/sntptest.h +++ b/contrib/ntp/sntp/tests/sntptest.h @@ -4,28 +4,8 @@ #include "ntp_stdlib.h" #include "sntp-opts.h" - -sntptest() { - optionSaveState(&sntpOptions); -} - -sntptest_destroy() { - optionRestore(&sntpOptions); -} - -void ActivateOption(const char* option, const char* argument) { - - const int ARGV_SIZE = 4; - - char* opts[ARGV_SIZE]; - - opts[0] = estrdup("sntpopts"); - opts[1] = estrdup(option); - opts[2] = estrdup(argument); - opts[3] = estrdup("127.0.0.1"); - - optionProcess(&sntpOptions, ARGV_SIZE, opts); -} - +void sntptest(void); +void sntptest_destroy(void); +void ActivateOption(const char* option, const char* argument); #endif // SNTPTEST_H diff --git a/contrib/ntp/sntp/tests/t-log.c b/contrib/ntp/sntp/tests/t-log.c new file mode 100644 index 0000000..1546584 --- /dev/null +++ b/contrib/ntp/sntp/tests/t-log.c @@ -0,0 +1,68 @@ +#include "config.h" +#include "unity.h" +#include "ntp_types.h" + + +//#include "log.h" +#include "log.c" + +void testChangePrognameInMysyslog(void); +void testOpenLogfileTest(void); + + +//in var/log/syslog (may differ depending on your OS), logged name of the program will be "TEST_PROGNAME". + +void testChangePrognameInMysyslog(void){ + sntp_init_logging("TEST_PROGNAME"); + msyslog(LOG_ERR, "TESTING sntp_init_logging()"); //%m will print the last errno? +} + +//writes log files in your own file instead of syslog! (MAY BE USEFUL TO SUPPRESS ERROR MESSAGES!) + +void testOpenLogfileTest(void){ + sntp_init_logging("TEST_PROGNAME2"); //this name is consistent through the entire program unless changed + open_logfile("testLogfile.log"); + //open_logfile("/var/log/syslog"); //this gives me "Permission Denied" when i do %m + + msyslog(LOG_ERR, "Cannot open log file %s","abcXX"); + //cleanup_log(); //unnecessary after log.c fix! + +} + + +//multiple cleanup_log() causes segfault. Probably the reason it's static. Opening multiple open_logfile(name) will cause segfault x.x I'm guessing it's not intended to be changed. Cleanup after unity test doesn't fix it, looks like. Calling in tearDown() also causes issues. + +void testWriteInCustomLogfile(void){ + char testString[256] = "12345 ABC"; + char testName[256] = "TEST_PROGNAME3"; + + remove("testLogfile2.log"); + + sntp_init_logging(testName); + open_logfile("testLogfile2.log"); // ./ causing issues + //sntp_init_logging(testName); + + + msyslog(LOG_ERR, testString); + FILE * f = fopen("testLogfile2.log","r"); + char line[256]; + + //should be only 1 line + while (fgets(line, sizeof(line), f)) { + printf("%s", line); + } + + + char* x = strstr(line,testName); + + TEST_ASSERT_TRUE( x != NULL); + + x = strstr(line,testString); + TEST_ASSERT_TRUE( x != NULL); + //cleanup_log(); + fclose(f); //using this will also cause segfault, because at the end, log.c will call (using atexit(func) function) cleanup_log(void)-> fclose(syslog_file); + //After the 1st fclose, syslog_file = NULL, and is never reset -> hopefully fixed by editing log.c + //TEST_ASSERT_EQUAL_STRING(testString,line); //doesn't work, line is dynamic because the process name is random. +} + + diff --git a/contrib/ntp/sntp/tests/utilities.c b/contrib/ntp/sntp/tests/utilities.c index 65be8df..39d22d6 100644 --- a/contrib/ntp/sntp/tests/utilities.c +++ b/contrib/ntp/sntp/tests/utilities.c @@ -2,18 +2,31 @@ #include "sntptest.h" #include "fileHandlingTest.h" - #include "main.h" #include "utilities.h" -#include "math.h" #include "unity.h" -const char * Version = "stub unit test Version string"; +#include <math.h> +sockaddr_u CreateSockaddr4(const char* address); +struct addrinfo CreateAddrinfo(sockaddr_u* sock); +void InitDebugTest(const char * filename); +void FinishDebugTest(const char * expected,const char * actual); +void test_IPv4Address(void); +void test_IPv6Address(void); +void test_SetLiVnMode1(void); +void test_SetLiVnMode2(void); +void test_PktOutput(void); +void test_LfpOutputBinaryFormat(void); +void test_LfpOutputDecimalFormat(void); -sockaddr_u CreateSockaddr4(const char* address) { +const char * Version = "stub unit test Version string"; + + +sockaddr_u +CreateSockaddr4(const char* address) { sockaddr_u s; s.sa4.sin_family = AF_INET; s.sa4.sin_addr.s_addr = inet_addr(address); @@ -22,7 +35,9 @@ sockaddr_u CreateSockaddr4(const char* address) { return s; } -struct addrinfo CreateAddrinfo( sockaddr_u* sock) { + +struct addrinfo +CreateAddrinfo(sockaddr_u* sock) { struct addrinfo a; a.ai_family = sock->sa.sa_family; a.ai_addrlen = SIZEOF_SOCKADDR(a.ai_family); @@ -34,26 +49,28 @@ struct addrinfo CreateAddrinfo( sockaddr_u* sock) { bool outputFileOpened; FILE* outputFile; -//debugUtilitiesTest() : outputFileOpened(false) {} -void InitDebugTest(const char * filename) { +void +InitDebugTest(const char * filename) { // Clear the contents of the current file. // Open the output file outputFile = fopen(filename, "w+"); - TEST_ASSERT_TRUE(outputFile != NULL); + TEST_ASSERT_NOT_NULL(outputFile); outputFileOpened = true; } + // Closes outputFile, and compare contents. -void FinishDebugTest(const char * expected, +void +FinishDebugTest(const char * expected, const char * actual) { if (outputFileOpened) fclose(outputFile); FILE * e = fopen(expected,"rb"); FILE * a = fopen(actual,"rb"); - TEST_ASSERT_TRUE(e != NULL); - TEST_ASSERT_TRUE(a != NULL); + TEST_ASSERT_NOT_NULL(e); + TEST_ASSERT_NOT_NULL(a); CompareFileContent(e, a); } @@ -65,7 +82,8 @@ void FinishDebugTest(const char * expected, * tests can be removed. */ -void test_IPv4Address() { +void +test_IPv4Address(void) { const char* ADDR = "192.0.2.10"; sockaddr_u input = CreateSockaddr4(ADDR); @@ -75,7 +93,9 @@ void test_IPv4Address() { TEST_ASSERT_EQUAL_STRING(ADDR, addrinfo_to_str(&inputA)); } -void test_IPv6Address() { + +void +test_IPv6Address(void) { const struct in6_addr address = { 0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3, 0x08, 0xd3, @@ -95,7 +115,9 @@ void test_IPv6Address() { TEST_ASSERT_EQUAL_STRING(expected, addrinfo_to_str(&inputA)); } -void test_SetLiVnMode1() { + +void +test_SetLiVnMode1(void) { struct pkt expected; expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOWARNING, NTP_VERSION, @@ -108,7 +130,9 @@ void test_SetLiVnMode1() { TEST_ASSERT_EQUAL(expected.li_vn_mode, actual.li_vn_mode); } -void test_SetLiVnMode2() { + +void +test_SetLiVnMode2(void) { struct pkt expected; expected.li_vn_mode = PKT_LI_VN_MODE(LEAP_NOTINSYNC, NTP_OLDVERSION, @@ -123,8 +147,9 @@ void test_SetLiVnMode2() { /* Debug utilities tests */ -void test_PktOutput() { - char * filename = "debug-output-pkt";//CreatePath("debug-output-pkt", OUTPUT_DIR); +void +test_PktOutput(void) { + char * filename = "debug-output-pkt"; InitDebugTest(filename); struct pkt testpkt; @@ -143,7 +168,9 @@ void test_PktOutput() { FinishDebugTest(CreatePath("debug-input-pkt", INPUT_DIR), filename); } -void test_LfpOutputBinaryFormat() { + +void +test_LfpOutputBinaryFormat(void) { char * filename = "debug-output-lfp-bin";//CreatePath("debug-output-lfp-bin", OUTPUT_DIR); InitDebugTest(filename); @@ -159,8 +186,10 @@ void test_LfpOutputBinaryFormat() { FinishDebugTest(CreatePath("debug-input-lfp-bin", INPUT_DIR), filename); } -void test_LfpOutputDecimalFormat() { - char * filename = "debug-output-lfp-dec"; //CreatePath("debug-output-lfp-dec", OUTPUT_DIR); + +void +test_LfpOutputDecimalFormat(void) { + char * filename = "debug-output-lfp-dec"; InitDebugTest(filename); l_fp test; @@ -174,4 +203,3 @@ void test_LfpOutputDecimalFormat() { FinishDebugTest(CreatePath("debug-input-lfp-dec", INPUT_DIR), filename); } - |
