nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Heed --disable-unittests properly

Browse Source
This commit is contained in:
rl1987 2018-06-02 12:53:04 +03:00
parent d7bbfd0f62
commit b7fae0f48c
5 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24891 Normal file
View File

@ -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.

10
src/common/include.am
View File

@ -74,7 +74,11 @@ LIBOR_CTIME_A_SRC = \
src/common/di_ops.c src/common/di_ops.c
src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC) src_common_libor_ctime_a_SOURCES = $(LIBOR_CTIME_A_SRC)
if UNITTESTS_ENABLED
src_common_libor_ctime_testing_a_SOURCES = $(LIBOR_CTIME_A_SRC) 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_a_CFLAGS = @CFLAGS_CONSTTIME@
src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS) 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_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_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_testing_a_SOURCES = $(LIBOR_A_SRC)
src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC) src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SRC)
src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_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_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_common_libor_crypto_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)

4
src/or/include.am
View File

@ -130,7 +130,11 @@ LIBTOR_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
endif endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
if UNITTESTS_ENABLED
src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES) 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 src_or_tor_SOURCES = src/or/tor_main.c
AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or

11
src/test/include.am
View File

@ -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 # 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. # 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/log_test_helpers.c \
src/test/hs_test_helpers.c \ src/test/hs_test_helpers.c \
src/test/rend_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_common.c \
src/test/testing_rsakeys.c \ src/test/testing_rsakeys.c \
src/ext/tinytest.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_slow.c \
src/test/test_crypto_slow.c \ src/test/test_crypto_slow.c \
src/test/test_util_slow.c \ src/test/test_util_slow.c \
src/test/testing_common.c \ src/test/testing_common.c \
src/test/testing_rsakeys.c \ src/test/testing_rsakeys.c \
src/ext/tinytest.c src/ext/tinytest.c
endif
src_test_test_memwipe_SOURCES = \ src_test_test_memwipe_SOURCES = \
src/test/test-memwipe.c src/test/test-memwipe.c

5
src/trunnel/include.am
View File

@ -41,7 +41,12 @@ TRUNNELHEADERS = \
src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES)
src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS)
if UNITTESTS_ENABLED
src_trunnel_libor_trunnel_testing_a_SOURCES = $(TRUNNELSOURCES) 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_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_trunnel_libor_trunnel_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)