| Makefile.am (285169) | Makefile.am (289764) |
|---|---|
| 1NULL = 2BUILT_SOURCES = | 1NULL = 2BUILT_SOURCES = |
| 3CLEANFILES = kod-output-blank kod-output-single kod-output-multiple debug-output-lfp-dec debug-output-lfp-bin debug-output-pkt 4DISTCLEANFILES = kod-output-blank kod-output-single kod-output-multiple | |
| 5EXTRA_PROGRAMS = 6 | 3EXTRA_PROGRAMS = 4 |
| 7run_unity = cd $(srcdir) && ruby ../../sntp/unity/auto/generate_test_runner.rb | 5CLEANFILES = \ 6 debug-output-lfp-bin \ 7 debug-output-lfp-dec \ 8 debug-output-pkt \ 9 kod-output-blank \ 10 kod-output-multiple \ 11 kod-output-single \ 12 testLogfile.log \ 13 testLogfile2.log \ 14 $(NULL) |
| 8 | 15 |
| 16DISTCLEANFILES = \ 17 kod-output-blank \ 18 kod-output-single \ 19 kod-output-multiple \ 20 testLogfile.log \ 21 testLogfile2.log \ 22 $(NULL) 23 24std_unity_list = \ 25 $(srcdir)/../unity/auto/generate_test_runner.rb \ 26 $(NULL) 27 28run_unity = cd $(srcdir) && ruby ../unity/auto/generate_test_runner.rb 29 |
|
| 9# Use EXTRA_PROGRAMS for test files that are under development but 10# not production-ready 11#EXTRA_PROGRAMS += test-packetHandling test-packetProcessing 12 13check_PROGRAMS = \ 14 test-crypto \ 15 test-keyFile \ 16 test-kodDatabase \ 17 test-kodFile \ | 30# Use EXTRA_PROGRAMS for test files that are under development but 31# not production-ready 32#EXTRA_PROGRAMS += test-packetHandling test-packetProcessing 33 34check_PROGRAMS = \ 35 test-crypto \ 36 test-keyFile \ 37 test-kodDatabase \ 38 test-kodFile \ |
| 39 test-log \ |
|
| 18 test-networking \ 19 test-packetHandling \ 20 test-packetProcessing \ 21 test-utilities \ 22 $(NULL) 23 | 40 test-networking \ 41 test-packetHandling \ 42 test-packetProcessing \ 43 test-utilities \ 44 $(NULL) 45 |
| 24if GTEST_AVAILABLE 25check_PROGRAMS += tests 26else 27EXTRA_PROGRAMS += tests 28endif 29 30#if BUILD_SNTP 31#check_PROGRAMS += tests 32#endif 33 34base_SOURCES = \ 35 ../tests_main.cpp \ 36 $(NULL) 37 38tests_SOURCES = \ 39 $(base_SOURCES) \ 40 g_networking.cpp \ 41 g_packetHandling.cpp \ 42 g_packetProcessing.cpp \ 43 $(NULL) 44 45# HMS: this test was for the 4.2.6 sntp code. 46# g_nameresolution.cpp 47 48# HMS: Somebody needs to audit the following files to 49# make sure all of these tests are now handled by Unity 50# 51# g_utilities.cpp 52# g_kodDatabase.cpp 53# g_keyFile.cpp 54# g_crypto.cpp 55# g_kodFile.cpp 56 | |
| 57noinst_HEADERS = \ | 46noinst_HEADERS = \ |
| 58 fileHandlingTest.h \ | |
| 59 sntptest.h \ | 47 sntptest.h \ |
| 60 g_fileHandlingTest.h \ 61 g_sntptest.h \ | |
| 62 $(NULL) 63 64dist_check_SCRIPTS = tests-runner 65 66EXTRA_DIST = \ 67 data/debug-input-lfp-bin \ 68 data/debug-input-lfp-dec \ 69 data/debug-input-pkt \ --- 14 unchanged lines hidden (view full) --- 84 data/kod-output-single \ 85 data/debug-output-pkt \ 86 data/debug-output-lfp-dec \ 87 data/kod-output-blank \ 88 data/debug-output-lfp-bin \ 89 $(NULL) 90 91#split into LDADD and tests_LDADD? | 48 $(NULL) 49 50dist_check_SCRIPTS = tests-runner 51 52EXTRA_DIST = \ 53 data/debug-input-lfp-bin \ 54 data/debug-input-lfp-dec \ 55 data/debug-input-pkt \ --- 14 unchanged lines hidden (view full) --- 70 data/kod-output-single \ 71 data/debug-output-pkt \ 72 data/debug-output-lfp-dec \ 73 data/kod-output-blank \ 74 data/debug-output-lfp-bin \ 75 $(NULL) 76 77#split into LDADD and tests_LDADD? |
| 92LDADD = \ | 78base_LDADD = \ |
| 93 ../libsntp.a \ 94 $(LIBOPTS_LDADD) \ 95 $(LDADD_LIBEVENT) \ 96 $(top_builddir)/../libntp/libntp.a \ 97 $(LDADD_LIBNTP) \ 98 $(LDADD_NTP) \ | 79 ../libsntp.a \ 80 $(LIBOPTS_LDADD) \ 81 $(LDADD_LIBEVENT) \ 82 $(top_builddir)/../libntp/libntp.a \ 83 $(LDADD_LIBNTP) \ 84 $(LDADD_NTP) \ |
| 99 $(GTEST_LDFLAGS) \ 100 $(GTEST_LIBS) \ | |
| 101 $(NULL) 102 | 85 $(NULL) 86 |
| 103unity_tests_LDADD = \ 104 $(LDADD) \ | 87LDADD = \ 88 $(base_LDADD) \ |
| 105 $(top_builddir)/unity/libunity.a \ 106 $(LIBM) \ 107 $(NULL) 108 | 89 $(top_builddir)/unity/libunity.a \ 90 $(LIBM) \ 91 $(NULL) 92 |
| 109AM_CFLAGS = $(CFLAGS_NTP) 110AM_CXXFLAGS = $(GTEST_CXXFLAGS) | 93AM_CFLAGS = $(CFLAGS_NTP) |
| 111 112AM_CPPFLAGS = $(SNTP_INCS) 113AM_CPPFLAGS += -I$(srcdir)/.. 114AM_CPPFLAGS += -I$(top_srcdir)/../tests 115AM_CPPFLAGS += $(LIBOPTS_CFLAGS) 116AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT) | 94 95AM_CPPFLAGS = $(SNTP_INCS) 96AM_CPPFLAGS += -I$(srcdir)/.. 97AM_CPPFLAGS += -I$(top_srcdir)/../tests 98AM_CPPFLAGS += $(LIBOPTS_CFLAGS) 99AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT) |
| 117AM_CPPFLAGS += $(GTEST_CPPFLAGS) | |
| 118AM_CPPFLAGS += $(CPPFLAGS_NTP) | 100AM_CPPFLAGS += $(CPPFLAGS_NTP) |
| 101AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H 102#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity 103AM_CPPFLAGS += -I$(top_srcdir)/unity |
|
| 119 120AM_LDFLAGS = $(LDFLAGS_NTP) 121 122BUILT_SOURCES += \ 123 $(srcdir)/run-crypto.c \ 124 $(srcdir)/run-keyFile.c \ 125 $(srcdir)/run-kodDatabase.c \ 126 $(srcdir)/run-kodFile.c \ 127 $(srcdir)/run-networking.c \ | 104 105AM_LDFLAGS = $(LDFLAGS_NTP) 106 107BUILT_SOURCES += \ 108 $(srcdir)/run-crypto.c \ 109 $(srcdir)/run-keyFile.c \ 110 $(srcdir)/run-kodDatabase.c \ 111 $(srcdir)/run-kodFile.c \ 112 $(srcdir)/run-networking.c \ |
| 113 $(srcdir)/run-packetHandling.c \ |
|
| 128 $(srcdir)/run-packetProcessing.c \ 129 $(srcdir)/run-utilities.c \ | 114 $(srcdir)/run-packetProcessing.c \ 115 $(srcdir)/run-utilities.c \ |
| 130 $(srcdir)/run-packetHandling.c \ | |
| 131 $(NULL) 132 | 116 $(NULL) 117 |
| 133test_keyFile_CFLAGS = \ 134 -I$(top_srcdir)/unity \ 135 $(NULL) 136 137test_keyFile_LDADD = \ 138 $(unity_tests_LDADD) \ 139 $(NULL) 140 141test_kodDatabase_CFLAGS = \ 142 -I$(top_srcdir)/unity \ 143 $(NULL) 144 145test_kodDatabase_LDADD = \ 146 $(unity_tests_LDADD) \ 147 $(NULL) 148 149test_kodFile_CFLAGS = \ 150 -I$(top_srcdir)/unity \ 151 $(NULL) 152 153test_kodFile_LDADD = \ 154 $(unity_tests_LDADD) \ 155 $(NULL) 156 157test_networking_CFLAGS = \ 158 -I$(top_srcdir)/unity \ 159 $(NULL) 160 161test_networking_LDADD = \ 162 $(unity_tests_LDADD) \ 163 $(NULL) 164 165test_utilities_CFLAGS = \ 166 -I$(top_srcdir)/unity \ 167 $(NULL) 168 169test_utilities_LDADD = \ 170 $(unity_tests_LDADD) \ 171 $(NULL) 172 173test_crypto_CFLAGS = \ 174 -I$(top_srcdir)/unity \ 175 $(NULL) 176 177test_crypto_LDADD = \ 178 $(unity_tests_LDADD) \ 179 $(NULL) 180 181test_packetProcessing_CFLAGS = \ 182 -I$(top_srcdir)/unity \ 183 $(NULL) 184 185test_packetProcessing_LDADD = \ 186 $(unity_tests_LDADD) \ 187 $(NULL) 188 189test_packetHandling_CFLAGS = \ 190 -I$(top_srcdir)/unity \ 191 $(NULL) 192 193test_packetHandling_LDADD = \ 194 $(unity_tests_LDADD) \ 195 $(NULL) 196 | |
| 197test_networking_SOURCES = \ 198 networking.c \ 199 run-networking.c \ 200 $(top_builddir)/version.c \ 201 $(NULL) 202 203test_packetHandling_SOURCES = \ 204 packetHandling.c \ 205 run-packetHandling.c \ 206 $(top_builddir)/version.c \ 207 $(NULL) 208 209test_kodDatabase_SOURCES = \ 210 kodDatabase.c \ 211 run-kodDatabase.c \ 212 $(top_builddir)/version.c \ 213 $(NULL) 214 215test_keyFile_SOURCES = \ | 118test_networking_SOURCES = \ 119 networking.c \ 120 run-networking.c \ 121 $(top_builddir)/version.c \ 122 $(NULL) 123 124test_packetHandling_SOURCES = \ 125 packetHandling.c \ 126 run-packetHandling.c \ 127 $(top_builddir)/version.c \ 128 $(NULL) 129 130test_kodDatabase_SOURCES = \ 131 kodDatabase.c \ 132 run-kodDatabase.c \ 133 $(top_builddir)/version.c \ 134 $(NULL) 135 136test_keyFile_SOURCES = \ |
| 137 fileHandlingTest.c \ |
|
| 216 keyFile.c \ 217 run-keyFile.c \ 218 $(top_builddir)/version.c \ 219 $(NULL) 220 221test_kodFile_SOURCES = \ | 138 keyFile.c \ 139 run-keyFile.c \ 140 $(top_builddir)/version.c \ 141 $(NULL) 142 143test_kodFile_SOURCES = \ |
| 144 fileHandlingTest.c \ |
|
| 222 kodFile.c \ 223 run-kodFile.c \ 224 $(top_builddir)/version.c \ 225 $(NULL) | 145 kodFile.c \ 146 run-kodFile.c \ 147 $(top_builddir)/version.c \ 148 $(NULL) |
| 226# ../version.c | |
| 227 228test_packetProcessing_SOURCES = \ 229 packetProcessing.c \ 230 run-packetProcessing.c \ | 149 150test_packetProcessing_SOURCES = \ 151 packetProcessing.c \ 152 run-packetProcessing.c \ |
| 153 sntptest.c \ |
|
| 231 $(NULL) 232 233test_utilities_SOURCES = \ | 154 $(NULL) 155 156test_utilities_SOURCES = \ |
| 157 fileHandlingTest.c \ |
|
| 234 utilities.c \ 235 run-utilities.c \ 236 $(NULL) 237 | 158 utilities.c \ 159 run-utilities.c \ 160 $(NULL) 161 |
| 162test_crypto_CFLAGS = \ 163 $(CFLAGS_LIBEVENT) \ 164 $(AM_CFLAGS) \ 165 $(NULL) 166 |
|
| 238test_crypto_SOURCES = \ 239 crypto.c \ 240 run-crypto.c \ 241 $(top_builddir)/version.c \ 242 $(NULL) 243 | 167test_crypto_SOURCES = \ 168 crypto.c \ 169 run-crypto.c \ 170 $(top_builddir)/version.c \ 171 $(NULL) 172 |
| 173test_log_SOURCES = \ 174 t-log.c \ 175 run-t-log.c \ 176 $(top_builddir)/version.c \ 177 $(NULL) |
|
| 244 | 178 |
| 179 |
|
| 245$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list) 246 $(run_unity) kodFile.c run-kodFile.c 247 248$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list) 249 $(run_unity) keyFile.c run-keyFile.c 250 251$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list) 252 $(run_unity) kodDatabase.c run-kodDatabase.c --- 8 unchanged lines hidden (view full) --- 261 $(run_unity) packetHandling.c run-packetHandling.c 262 263$(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list) 264 $(run_unity) utilities.c run-utilities.c 265 266$(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list) 267 $(run_unity) crypto.c run-crypto.c 268 | 180$(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list) 181 $(run_unity) kodFile.c run-kodFile.c 182 183$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list) 184 $(run_unity) keyFile.c run-keyFile.c 185 186$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list) 187 $(run_unity) kodDatabase.c run-kodDatabase.c --- 8 unchanged lines hidden (view full) --- 196 $(run_unity) packetHandling.c run-packetHandling.c 197 198$(srcdir)/run-utilities.c: $(srcdir)/utilities.c $(std_unity_list) 199 $(run_unity) utilities.c run-utilities.c 200 201$(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list) 202 $(run_unity) crypto.c run-crypto.c 203 |
| 204$(srcdir)/run-t-log.c: $(srcdir)/t-log.c $(std_unity_list) 205 $(run_unity) t-log.c run-t-log.c 206 207 |
|
| 269#$(srcdir)/../version.c: $(srcdir)/../version.c 270# gcc -o version.o ../version.c 271 272TESTS = 273 274if !NTP_CROSSCOMPILE 275TESTS += $(check_PROGRAMS) 276endif --- 19 unchanged lines hidden (view full) --- 296CLEANFILES += check-libntp check-libunity 297 298check-libntp: ../../libntp/libntp.a 299 @echo stamp > $@ 300 301../../libntp/libntp.a: 302 cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a 303 | 208#$(srcdir)/../version.c: $(srcdir)/../version.c 209# gcc -o version.o ../version.c 210 211TESTS = 212 213if !NTP_CROSSCOMPILE 214TESTS += $(check_PROGRAMS) 215endif --- 19 unchanged lines hidden (view full) --- 235CLEANFILES += check-libntp check-libunity 236 237check-libntp: ../../libntp/libntp.a 238 @echo stamp > $@ 239 240../../libntp/libntp.a: 241 cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a 242 |
| 304check-libunity: ../sntp/unity/libunity.a | 243check-libunity: ../unity/libunity.a |
| 305 @echo stamp > $@ 306 | 244 @echo stamp > $@ 245 |
| 307../sntp/unity/libunity.a: | 246../unity/libunity.a: |
| 308 cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a 309 310include $(top_srcdir)/depsver.mf 311include $(top_srcdir)/includes.mf | 247 cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a 248 249include $(top_srcdir)/depsver.mf 250include $(top_srcdir)/includes.mf |