diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-06 14:56:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-10 15:20:09 -0400 |
| commit | f7d654b81e1a65803c22bb53fc1d3a2021d87d50 (patch) | |
| tree | f97ef47c02419b0d38f03b85ad62f745e653cf41 /src/common | |
| parent | fab99844fc324b2c9d415b1b1c192a25cf1c4230 (diff) | |
| download | tor-f7d654b81e1a65803c22bb53fc1d3a2021d87d50.tar.gz tor-f7d654b81e1a65803c22bb53fc1d3a2021d87d50.zip | |
Start work on fancy compiler tricks to expose extra stuff to our tests
This is mainly a matter of automake trickery: we build each static
library in two versions now: one with the TOR_UNIT_TESTS macro
defined, and one without. When TOR_UNIT_TESTS is defined, we can
enable mocking and expose more functions. When it's not defined, we
can lock the binary down more.
The alternatives would be to have alternate build modes: a "testing
configuration" for building the libraries with test support, and a
"production configuration" for building them without. I don't favor
that approach, since I think it would mean more people runnning
binaries build for testing, or more people not running unit tests.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/include.am | 31 | ||||
| -rw-r--r-- | src/common/testsupport.h | 14 |
2 files changed, 41 insertions, 4 deletions
diff --git a/src/common/include.am b/src/common/include.am index 68275cbcf7..3d8cc8e9eb 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -1,5 +1,15 @@ -noinst_LIBRARIES+= src/common/libor.a src/common/libor-crypto.a src/common/libor-event.a +noinst_LIBRARIES += \ + src/common/libor.a \ + src/common/libor-crypto.a \ + src/common/libor-event.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += \ + src/common/libor-testing.a \ + src/common/libor-crypto-testing.a \ + src/common/libor-event-testing.a +endif EXTRA_DIST+= \ src/common/common_sha1.i \ @@ -38,7 +48,7 @@ if CURVE25519_ENABLED libcrypto_extra_source=src/common/crypto_curve25519.c endif -src_common_libor_a_SOURCES = \ +LIBOR_A_SOURCES = \ src/common/address.c \ src/common/compat.c \ src/common/container.c \ @@ -51,7 +61,7 @@ src_common_libor_a_SOURCES = \ src/common/util_codedigest.c \ $(libor_extra_source) -src_common_libor_crypto_a_SOURCES = \ +LIBOR_CRYPTO_A_SOURCES = \ src/common/aes.c \ src/common/crypto.c \ src/common/crypto_format.c \ @@ -59,7 +69,19 @@ src_common_libor_crypto_a_SOURCES = \ src/common/tortls.c \ $(libcrypto_extra_source) -src_common_libor_event_a_SOURCES = src/common/compat_libevent.c +LIBOR_EVENT_A_SOURCES = src/common/compat_libevent.c + +src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES) +src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) +src_common_libor_event_a_SOURCES = $(LIBOR_EVENT_A_SOURCES) + +src_common_libor_testing_a_SOURCES = $(LIBOR_A_SOURCES) +src_common_libor_crypto_testing_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) +src_common_libor_event_testing_a_SOURCES = $(LIBOR_EVENT_A_SOURCES) + +src_common_libor_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_common_libor_crypto_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) +src_common_libor_event_testing_a_CPPFLAGS = -DTOR_UNIT_TESTS $(AM_CPPFLAGS) COMMONHEADERS = \ src/common/address.h \ @@ -74,6 +96,7 @@ COMMONHEADERS = \ src/common/memarea.h \ src/common/mempool.h \ src/common/procmon.h \ + src/common/testsupport.h \ src/common/torgzip.h \ src/common/torint.h \ src/common/torlog.h \ diff --git a/src/common/testsupport.h b/src/common/testsupport.h new file mode 100644 index 0000000000..621fd8c833 --- /dev/null +++ b/src/common/testsupport.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_TESTSUPPORT_H +#define TOR_TESTSUPPORT_H + +#ifdef TOR_UNIT_TESTS +#define STATIC_UNLESS_TESTING +#else +#define STATIC_UNLESS_TESTING static +#endif + +#endif + |