diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2015-03-22 04:21:08 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2015-03-22 04:21:08 +0100 |
| commit | e069a82aa723e6ee5a79f658c563781fb3e6e648 (patch) | |
| tree | d7912c9452b454b56f3e59257db374e8beb3c4d9 | |
| parent | 1228dd293b60a8eaab03472fa29428c5e2752c44 (diff) | |
| download | tor-e069a82aa723e6ee5a79f658c563781fb3e6e648.tar.gz tor-e069a82aa723e6ee5a79f658c563781fb3e6e648.zip | |
build tor-cov-{resolve,gencert}
This allows us to run tor-cov-gencert from chutney for coverage builds.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/tools/include.am | 28 |
2 files changed, 30 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index b31a7132d4..0751c75294 100644 --- a/.gitignore +++ b/.gitignore @@ -179,10 +179,14 @@ cscope.* # /src/tools/ /src/tools/tor-checkkey /src/tools/tor-resolve +/src/tools/tor-cov-resolve /src/tools/tor-gencert +/src/tools/tor-cov-gencert /src/tools/tor-checkkey.exe /src/tools/tor-resolve.exe +/src/tools/tor-cov-resolve.exe /src/tools/tor-gencert.exe +/src/tools/tor-cov-gencert.exe /src/tools/Makefile /src/tools/Makefile.in diff --git a/src/tools/include.am b/src/tools/include.am index 54b150a80c..5d778c1143 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -1,21 +1,45 @@ bin_PROGRAMS+= src/tools/tor-resolve src/tools/tor-gencert noinst_PROGRAMS+= src/tools/tor-checkkey +if COVERAGE_ENABLED +noinst_PROGRAMS+= src/tools/tor-cov-resolve src/tools/tor-cov-gencert +endif + src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_LDFLAGS = src_tools_tor_resolve_LDADD = src/common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@ +if COVERAGE_ENABLED +src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c +src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_tools_tor_cov_resolve_LDADD = src/common/libor-testing.a \ + @TOR_LIB_MATH@ @TOR_LIB_WS32@ +endif + src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ - $(LIBDONNA) \ + $(LIBDONNA) \ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ + +if COVERAGE_ENABLED +src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c +src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ +src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \ + src/common/libor-crypto-testing.a \ + $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ +endif src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \ - $(LIBDONNA) \ + $(LIBDONNA) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ |