commit b7fae0f48ce63371cd2454a0b59d423778a2a7c6 Author: rl1987 rl1987@sdf.lonestar.org Date: Sat Jun 2 12:53:04 2018 +0300
Heed --disable-unittests properly --- changes/bug24891 | 4 ++++ src/common/include.am | 10 ++++++++++ src/or/include.am | 4 ++++ src/test/include.am | 11 +++++++++-- src/trunnel/include.am | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/changes/bug24891 b/changes/bug24891 new file mode 100644 index 000000000..403b2b112 --- /dev/null +++ b/changes/bug24891 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Refrain from compiling unit testing related object files + when --disable-unittests is set to configure script. + Fixes bug 24891; bugfix on 0.2.5.1-alpha. diff --git a/src/common/include.am b/src/common/include.am index bce3fa20f..cfaf99367 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -74,7 +74,11 @@ LIBOR_CTIME_A_SRC = \ src/common/di_ops.c
src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC) +if UNITTESTS_ENABLED src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC) +else +src_common_libor_ctime_testing_a_SOURCES = +endif src_common_libor_ctime_a_CFLAGS = @CFLAGS_CONSTTIME@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS)
@@ -137,9 +141,15 @@ src_common_libor_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SRC)
+if UNITTESTS_ENABLED src_common_libor_testing_a_SOURCES = $(LIBOR_A_SRC) src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SRC) +else +src_common_libor_testing_a_SOURCES = +src_common_libor_crypto_testing_a_SOURCES = +src_common_libor_event_testing_a_SOURCES = +endif
src_common_libor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) diff --git a/src/or/include.am b/src/or/include.am index bc0b9d2bf..0e2aac4aa 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -130,7 +130,11 @@ LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) +if UNITTESTS_ENABLED src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES) +else +src_or_libtor_testing_a_SOURCES = +endif
src_or_tor_SOURCES = src/or/tor_main.c AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or diff --git a/src/test/include.am b/src/test/include.am index 9543635c8..48257467a 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -79,7 +79,10 @@ src_test_AM_CPPFLAGS = -DSHARE_DATADIR=""$(datadir)"" \ # This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it.
-src_test_test_SOURCES = \ +src_test_test_SOURCES = + +if UNITTESTS_ENABLED +src_test_test_SOURCES += \ src/test/log_test_helpers.c \ src/test/hs_test_helpers.c \ src/test/rend_test_helpers.c \ @@ -178,14 +181,18 @@ src_test_test_SOURCES = \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ src/ext/tinytest.c +endif
-src_test_test_slow_SOURCES = \ +src_test_test_slow_SOURCES = +if UNITTESTS_ENABLED +src_test_test_slow_SOURCES += \ src/test/test_slow.c \ src/test/test_crypto_slow.c \ src/test/test_util_slow.c \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ src/ext/tinytest.c +endif
src_test_test_memwipe_SOURCES = \ src/test/test-memwipe.c diff --git a/src/trunnel/include.am b/src/trunnel/include.am index ca79ff3a3..b249fb302 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -41,7 +41,12 @@ TRUNNELHEADERS = \ src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS)
+if UNITTESTS_ENABLED src_trunnel_libor_trunnel_testing_a_SOURCES = $(TRUNNELSOURCES) +else +src_trunnel_libor_trunnel_testing_a_SOURCES = +endif + src_trunnel_libor_trunnel_testing_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)