nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
4f5cea1f59
tor/Makefile.am

727 lines
24 KiB
Makefile
Raw Normal View History

Happy new year! svn:r5949
2006-02-09 06:46:49 +01:00
# Copyright (c) 2001-2004, Roger Dingledine
Update some copyright notices: it is now 2008. svn:r13412
2008-02-07 06:31:47 +01:00
# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
Bump copyright date to 2019
2019-01-16 18:33:22 +01:00
# Copyright (c) 2007-2019, The Tor Project, Inc.
update copyright notices. svn:r3982
2005-04-01 22:15:56 +02:00
# See LICENSE for licensing information
Use a nicely written autoconf macro to determine the sign of a type This beats our old implementation, which wouldn't work when cross-compiling
2013-02-07 22:23:48 +01:00
ACLOCAL_AMFLAGS = -I m4
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
noinst_LIBRARIES=
EXTRA_DIST=
noinst_HEADERS=
bin_PROGRAMS=
Fuzzing: Add an initial fuzzing tool, for descriptors. This will need some refactoring and mocking.
2016-12-14 01:15:26 +01:00
EXTRA_PROGRAMS=
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
CLEANFILES=
TESTS=
noinst_PROGRAMS=
DISTCLEANFILES=
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
MOSTLYCLEANFILES=
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
bin_SCRIPTS=
Simplify AM_CPPFLAGS include setup We had accumulated a bunch of cruft here. Now let's only include src and src/ext. (exception: src/trunnel is autogenerated code, and need to include src/trunnel.) This commit will break the build hard. The next commit will fix it.
2018-06-20 15:25:50 +02:00
AM_CPPFLAGS=\
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/ext \
Run rectify_include_paths.py
2018-06-20 15:35:05 +02:00
-I$(top_srcdir)/src/ext/trunnel \
-I$(top_srcdir)/src/trunnel
Simplify AM_CPPFLAGS include setup We had accumulated a bunch of cruft here. Now let's only include src and src/ext. (exception: src/trunnel is autogenerated code, and need to include src/trunnel.) This commit will break the build hard. The next commit will fix it.
2018-06-20 15:25:50 +02:00
Split a few long lists in Makefiles.
2019-12-04 18:21:53 +01:00
AM_CFLAGS= \
@TOR_SYSTEMD_CFLAGS@ \
@CFLAGS_BUGTRAP@ \
@TOR_LZMA_CFLAGS@ \
@TOR_ZSTD_CFLAGS@
Add -ftrapv to gcc-hardening ... mostly! We know there are overflows in curve25519-donna-c32, so we'll have to have that one be fwrapv. Only apply the asan, ubsan, and trapv options to the code that does not need to run in constant time. Those options introduce branches to the code they instrument. (These introduced branches should never actually be taken, so it might _still_ be constant time after all, but branch predictors are complicated enough that I'm not really confident here. Let's aim for safety.) Closes 17983.
2016-04-13 00:59:40 +02:00
SHELL=@SHELL@
Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase.
2015-09-25 16:39:11 +02:00
if COVERAGE_ENABLED
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
TESTING_TOR_BINARY=$(top_builddir)/src/app/tor-cov$(EXEEXT)
Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase.
2015-09-25 16:39:11 +02:00
else
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT)
Only setup environment variables for tests Using the AM_TESTS_ENVIRONMENT variable ensures the environment variables are only set during test execution and not during the compilation phase.
2015-09-25 16:39:11 +02:00
endif
Add --enable-rust configure switch Introduce a way to optionally enable Rust integration for our builds. No actual Rust code is added yet and specifying the flag has no effect other than failing the build if rustc and cargo are unavailable.
2017-04-29 08:51:51 +02:00
if USE_RUST
Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2
2018-11-19 15:22:30 +01:00
rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)
Add --enable-rust configure switch Introduce a way to optionally enable Rust integration for our builds. No actual Rust code is added yet and specifying the flag has no effect other than failing the build if rustc and cargo are unavailable.
2017-04-29 08:51:51 +02:00
else
rust_ldadd=
endif
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# "Common" libraries used to link tor's utility code.
TOR_UTIL_LIBS = \
Extract the non-stats part of geoip into a new src/lib/geoip.
2018-09-27 16:26:01 +02:00
src/lib/libtor-geoip.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-process.a \
Move buffers.c out of lib/containers to resolve a circularity.
2018-11-07 00:05:14 +01:00
src/lib/libtor-buf.a \
Add a "typed_var" abstraction to implement lvalue access in C. Right now, this has been done at a high level by confparse.c, but it makes more sense to lower it. This API is radically un-typesafe as it stands; we'll be wrapping it in a safer API as we do #30914 and lower the struct manipulation code as well. Closes ticket 30864.
2019-06-14 14:42:24 +02:00
src/lib/libtor-confmgt.a \
pubsub: relationship checking functionality This code tries to prevent a large number of possible errors by enforcing different restrictions on the messages that different modules publish and subscribe to. Some of these rules are probably too strict, and some too lax: we should feel free to change them as needed as we move forward and learn more.
2019-01-15 15:01:41 +01:00
src/lib/libtor-pubsub.a \
Low-level dispatch module for publish-subscribe mechanism This module implements a way to send messages from one module to another, with associated data types. It does not yet do anything to ensure that messages are correct, that types match, or that other forms of consistency are preserved.
2019-01-12 02:17:04 +01:00
src/lib/libtor-dispatch.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-time.a \
src/lib/libtor-fs.a \
src/lib/libtor-encoding.a \
src/lib/libtor-sandbox.a \
Extract core part of smartlist code into its own library. The smartlist_core library now contains only the parts of smartlists that are needed for the logging library. This resolves the circularity between "container" and "log". The "containers" library still uses the logging code, and has the higher-level smartlist functions.
2018-06-26 18:13:23 +02:00
src/lib/libtor-container.a \
Move network code to libtor-net. There are some additional changes to come: those points are marked by XXXX.
2018-06-27 02:42:47 +02:00
src/lib/libtor-net.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-thread.a \
src/lib/libtor-memarea.a \
Move floating-point math functions into a new lib/math
2018-06-28 18:24:45 +02:00
src/lib/libtor-math.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
src/lib/libtor-meminfo.a \
Extract get_uname to lib/osinfo.
2018-06-29 16:37:35 +02:00
src/lib/libtor-osinfo.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-log.a \
src/lib/libtor-lock.a \
src/lib/libtor-fdio.a \
src/lib/libtor-string.a \
Extract getpass to a new lib/term library (Term is short for terminal)
2018-06-29 16:50:05 +02:00
src/lib/libtor-term.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-smartlist-core.a \
Extract tor_malloc and friends to a new module.
2018-06-21 21:17:54 +02:00
src/lib/libtor-malloc.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-wallclock.a \
src/lib/libtor-err.a \
Move the code that knows our tor version into a lowest-level lib
2018-11-01 17:33:22 +01:00
src/lib/libtor-version.a \
Move winprocess_sys into a new low-level hardening module This code was in our process module, but it doesn't belong there: process is for launching and monitoring subprocesses, not for hardening the current process. This change lets us have our subsystem init order more closely match our dependency order.
2020-02-13 19:14:54 +01:00
src/lib/libtor-llharden.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-intmath.a \
lib: New metrics library Used to provide an interface to create metrics store and update the entries. Related to #40063 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-19 21:15:47 +02:00
src/lib/libtor-ctime.a \
src/lib/libtor-metrics.a
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# Variants of the above for linking the testing variant of tor (for coverage
# and tests)
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
if UNITTESTS_ENABLED
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
TOR_UTIL_TESTING_LIBS = \
Extract the non-stats part of geoip into a new src/lib/geoip.
2018-09-27 16:26:01 +02:00
src/lib/libtor-geoip-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-process-testing.a \
Move buffers.c out of lib/containers to resolve a circularity.
2018-11-07 00:05:14 +01:00
src/lib/libtor-buf-testing.a \
Add a "typed_var" abstraction to implement lvalue access in C. Right now, this has been done at a high level by confparse.c, but it makes more sense to lower it. This API is radically un-typesafe as it stands; we'll be wrapping it in a safer API as we do #30914 and lower the struct manipulation code as well. Closes ticket 30864.
2019-06-14 14:42:24 +02:00
src/lib/libtor-confmgt-testing.a \
pubsub: relationship checking functionality This code tries to prevent a large number of possible errors by enforcing different restrictions on the messages that different modules publish and subscribe to. Some of these rules are probably too strict, and some too lax: we should feel free to change them as needed as we move forward and learn more.
2019-01-15 15:01:41 +01:00
src/lib/libtor-pubsub-testing.a \
Low-level dispatch module for publish-subscribe mechanism This module implements a way to send messages from one module to another, with associated data types. It does not yet do anything to ensure that messages are correct, that types match, or that other forms of consistency are preserved.
2019-01-12 02:17:04 +01:00
src/lib/libtor-dispatch-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-time-testing.a \
src/lib/libtor-fs-testing.a \
src/lib/libtor-encoding-testing.a \
src/lib/libtor-sandbox-testing.a \
Extract core part of smartlist code into its own library. The smartlist_core library now contains only the parts of smartlists that are needed for the logging library. This resolves the circularity between "container" and "log". The "containers" library still uses the logging code, and has the higher-level smartlist functions.
2018-06-26 18:13:23 +02:00
src/lib/libtor-container-testing.a \
Move network code to libtor-net. There are some additional changes to come: those points are marked by XXXX.
2018-06-27 02:42:47 +02:00
src/lib/libtor-net-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-thread-testing.a \
src/lib/libtor-memarea-testing.a \
Move floating-point math functions into a new lib/math
2018-06-28 18:24:45 +02:00
src/lib/libtor-math-testing.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
src/lib/libtor-meminfo-testing.a \
Extract get_uname to lib/osinfo.
2018-06-29 16:37:35 +02:00
src/lib/libtor-osinfo-testing.a \
Extract getpass to a new lib/term library (Term is short for terminal)
2018-06-29 16:50:05 +02:00
src/lib/libtor-term-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-log-testing.a \
src/lib/libtor-lock-testing.a \
src/lib/libtor-fdio-testing.a \
src/lib/libtor-string-testing.a \
src/lib/libtor-smartlist-core-testing.a \
Extract tor_malloc and friends to a new module.
2018-06-21 21:17:54 +02:00
src/lib/libtor-malloc-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-wallclock-testing.a \
src/lib/libtor-err-testing.a \
Move the code that knows our tor version into a lowest-level lib
2018-11-01 17:33:22 +01:00
src/lib/libtor-version-testing.a \
Move winprocess_sys into a new low-level hardening module This code was in our process module, but it doesn't belong there: process is for launching and monitoring subprocesses, not for hardening the current process. This change lets us have our subsystem init order more closely match our dependency order.
2020-02-13 19:14:54 +01:00
src/lib/libtor-llharden-testing.a \
Fix windows compilation in compat_time We need to use lib/fs/winlib.h here so that we can use GetTickCount64. I would love to declare that XP is dead, and everybody has GetTickCount64.
2018-06-28 19:40:21 +02:00
src/lib/libtor-intmath.a \
lib: New metrics library Used to provide an interface to create metrics store and update the entries. Related to #40063 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-19 21:15:47 +02:00
src/lib/libtor-ctime-testing.a \
src/lib/libtor-metrics-testing.a
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
endif
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# Internal crypto libraries used in Tor
TOR_CRYPTO_LIBS = \
Split crypto and tls libraries into directories I am calling the crypto library "crypt_ops", since I want higher-level crypto things to be separated from lower-level ones. This library will hold only the low-level ones, once we have it refactored.
2018-06-21 18:46:11 +02:00
src/lib/libtor-tls.a \
src/lib/libtor-crypt-ops.a \
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
$(LIBKECCAK_TINY) \
$(LIBDONNA)
# Variants of the above for linking the testing variant of tor (for coverage
# and tests)
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
if UNITTESTS_ENABLED
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
TOR_CRYPTO_TESTING_LIBS = \
Split crypto and tls libraries into directories I am calling the crypto library "crypt_ops", since I want higher-level crypto things to be separated from lower-level ones. This library will hold only the low-level ones, once we have it refactored.
2018-06-21 18:46:11 +02:00
src/lib/libtor-tls-testing.a \
src/lib/libtor-crypt-ops-testing.a \
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
$(LIBKECCAK_TINY) \
$(LIBDONNA)
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
endif
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# All static libraries used to link tor.
TOR_INTERNAL_LIBS = \
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
src/core/libtor-app.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
src/lib/libtor-compress.a \
All remaining files in src/common belong to the event loop.
2018-07-05 21:13:44 +02:00
src/lib/libtor-evloop.a \
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
src/trunnel/libor-trunnel.a \
Move trace into its own library in libs. Apparently it has no testing variant.
2018-06-21 18:02:14 +02:00
src/lib/libtor-trace.a
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
libtor.a: $(TOR_INTERNAL_LIBS)
$(AM_V_AR) export AR="$(AR)"; \
export ARFLAGS="$(ARFLAGS)"; \
$(top_srcdir)/scripts/build/combine_libs libtor.a $(TOR_INTERNAL_LIBS)
MOSTLYCLEANFILES += libtor.a
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# Variants of the above for linking the testing variant of tor (for coverage
# and tests)
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
if UNITTESTS_ENABLED
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
TOR_INTERNAL_TESTING_LIBS = \
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
src/core/libtor-app-testing.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
src/lib/libtor-compress-testing.a \
All remaining files in src/common belong to the event loop.
2018-07-05 21:13:44 +02:00
src/lib/libtor-evloop-testing.a \
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
$(TOR_CRYPTO_TESTING_LIBS) \
$(TOR_UTIL_TESTING_LIBS) \
src/trunnel/libor-trunnel-testing.a \
Move trace into its own library in libs. Apparently it has no testing variant.
2018-06-21 18:02:14 +02:00
src/lib/libtor-trace.a
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
src/test/libtor-testing.a: $(TOR_INTERNAL_TESTING_LIBS)
$(AM_V_AR) export AR="$(AR)"; \
export ARFLAGS="$(ARFLAGS)"; \
export RANLIB="$(RANLIB)"; \
$(top_srcdir)/scripts/build/combine_libs src/test/libtor-testing.a $(TOR_INTERNAL_TESTING_LIBS)
MOSTLYCLEANFILES += src/test/libtor-testing.a
Fix build to work with --disable-unittests again
2018-07-16 12:49:40 +02:00
endif
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
TOR_LDFLAGS_CRYPTLIB=@TOR_LDFLAGS_openssl@
TOR_LIBS_CRYPTLIB=@TOR_OPENSSL_LIBS@
Add a configure switch to build with NSS. When it is set, include the NSS headers and libraries as appropriate. Doesn't actually use them yet, though.
2018-07-11 18:57:30 +02:00
TOR_CFLAGS_CRYPTLIB=
if USE_NSS
TOR_CFLAGS_CRYPTLIB+=@NSS_CFLAGS@
TOR_LIBS_CRYPTLIB+=@NSS_LIBS@
endif
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
# All libraries used to link tor-cov
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
include src/include.am
include doc/include.am
include contrib/include.am
added automake/autoconf support. When in doubt, "aclocal && autoconf && autoheader && automake" from the top dir. svn:r10
2002-06-29 01:26:42 +02:00
Try disabling "make all" when checking docs.
2020-08-12 17:35:15 +02:00
manpages: $(nodist_man1_MANS)
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
EXTRA_DIST+= \
Makefile: Stop using trailing spaces in an EXTRA_DIST clause Based on 8-space tabs, the git/less default. Cleanup after 31919.
2019-10-25 08:13:16 +02:00
ChangeLog \
CONTRIBUTING \
CODE_OF_CONDUCT \
INSTALL \
LICENSE \
Makefile.nmake \
README \
ReleaseNotes \
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
scripts/build/combine_libs \
Makefile: Stop using trailing spaces in an EXTRA_DIST clause Based on 8-space tabs, the git/less default. Cleanup after 31919.
2019-10-25 08:13:16 +02:00
scripts/maint/checkIncludes.py \
scripts/maint/checkSpace.pl \
Distribute checkSpaceTest.sh and run it when we have perl.
2019-12-02 18:43:10 +01:00
scripts/maint/checkSpaceTest.sh \
scripts/maint/checkspace_tests/dubious.c \
scripts/maint/checkspace_tests/dubious.h \
scripts/maint/checkspace_tests/expected.txt \
scripts/maint/checkspace_tests/good_guard.h \
scripts/maint/checkspace_tests/same_guard.h \
scripts/maint/checkspace_tests/subdir/dubious.c \
Makefile: Stop using trailing spaces in an EXTRA_DIST clause Based on 8-space tabs, the git/less default. Cleanup after 31919.
2019-10-25 08:13:16 +02:00
scripts/maint/checkShellScripts.sh \
scripts/maint/practracker/README \
scripts/maint/practracker/exceptions.txt \
scripts/maint/practracker/includes.py \
scripts/maint/practracker/metrics.py \
scripts/maint/practracker/practracker.py \
scripts/maint/practracker/practracker_tests.py \
scripts/maint/practracker/problem.py \
scripts/maint/practracker/testdata/.may_include \
scripts/maint/practracker/testdata/a.c \
scripts/maint/practracker/testdata/b.c \
scripts/maint/practracker/testdata/ex0-expected.txt \
scripts/maint/practracker/testdata/ex0.txt \
scripts/maint/practracker/testdata/ex1-expected.txt \
scripts/maint/practracker/testdata/ex1.txt \
scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \
practracker: integration tests for --regen and --regen-overbroad
2020-02-03 19:11:58 +01:00
scripts/maint/practracker/testdata/ex1-regen-expected.txt \
scripts/maint/practracker/testdata/ex1-regen-overbroad-expected.txt \
Makefile: Stop using trailing spaces in an EXTRA_DIST clause Based on 8-space tabs, the git/less default. Cleanup after 31919.
2019-10-25 08:13:16 +02:00
scripts/maint/practracker/testdata/ex.txt \
scripts/maint/practracker/testdata/header.h \
scripts/maint/practracker/testdata/not_c_file \
scripts/maint/practracker/test_practracker.sh \
scripts/maint/practracker/util.py \
scripts/coccinelle/apply.sh \
scripts/coccinelle/check_cocci_parse.sh \
scripts/coccinelle/exceptions.txt \
scripts/coccinelle/test-operator-cleanup \
scripts/coccinelle/tor-coccinelle.h \
Makefile: Add check_cocci_parse.sh as check-cocci And add it to check-local. Part of 31919.
2019-10-23 07:44:17 +02:00
scripts/coccinelle/try_parse.sh
Updated HACKING and README docs HACKING now explains bandwidth throttling, congestion control, and router twins. Read it and see if it makes sense. svn:r68
2002-07-22 06:07:34 +02:00
Teach 'make tags' about MOCK_IMPL. Patch from nherring; closes ticket 16869
2016-10-03 19:58:09 +02:00
## This tells etags how to find mockable function definitions.
AM_ETAGSFLAGS=--regex='{c}/MOCK_IMPL([^,]+,\W*\([a-zA-Z0-9_]+\)\W*,/\1/s'
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 18:37:11 +02:00
if COVERAGE_ENABLED
TEST_CFLAGS=-fno-inline -fprofile-arcs -ftest-coverage
Fix the --disable-asserts-in-tests configure option
2016-02-05 14:40:07 +01:00
if DISABLE_ASSERTS_IN_UNIT_TESTS
build: Always compile module support for tests The --disable-module-* configure option removes code from the final binary but we still build the unit tests with the disable module(s) so we can actually test that code path all the time and not forget about it. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-27 17:33:22 +02:00
TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE -DDISABLE_ASSERTS_IN_UNIT_TESTS @TOR_MODULES_ALL_ENABLED@
Fix the --disable-asserts-in-tests configure option
2016-02-05 14:40:07 +01:00
else
build: Always compile module support for tests The --disable-module-* configure option removes code from the final binary but we still build the unit tests with the disable module(s) so we can actually test that code path all the time and not forget about it. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-27 17:33:22 +02:00
TEST_CPPFLAGS=-DTOR_UNIT_TESTS -DTOR_COVERAGE @TOR_MODULES_ALL_ENABLED@
Fix the --disable-asserts-in-tests configure option
2016-02-05 14:40:07 +01:00
endif
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
TEST_NETWORK_FLAGS=--coverage --hs-multi-client 1
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 18:37:11 +02:00
else
TEST_CFLAGS=
build: Always compile module support for tests The --disable-module-* configure option removes code from the final binary but we still build the unit tests with the disable module(s) so we can actually test that code path all the time and not forget about it. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-27 17:33:22 +02:00
TEST_CPPFLAGS=-DTOR_UNIT_TESTS @TOR_MODULES_ALL_ENABLED@
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
TEST_NETWORK_FLAGS=--hs-multi-client 1
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 18:37:11 +02:00
endif
make: Improve the documentation for test-network-all "make test-network-all" shows the warnings from each test-network.sh run on the console, so developers see new warnings early. Improve the documentation for this feature, and rename a Makefile variable so the code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc.
2019-06-14 03:44:26 +02:00
TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 18:37:11 +02:00
Add libfuzzer support.
2016-12-19 21:17:42 +01:00
if LIBFUZZER_ENABLED
libfuzzer tweaks per recommendations
2017-01-09 16:44:55 +01:00
TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div
# not "edge"
Add libfuzzer support.
2016-12-19 21:17:42 +01:00
endif
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
TEST_NETWORK_ALL_LOG_DIR=$(top_builddir)/test_network_log
TEST_NETWORK_ALL_DRIVER_FLAGS=--color-tests yes
force the admin to mkdir the datadirectory himself, so he gets the permissions right. also this means clients will never need to make the datadirectory. also remind the admin to fix his clock before setting up his node. svn:r650
2003-10-22 06:33:11 +02:00
#install-data-local:
# $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor
Integrate jbash's RPM spec into build process. (Requires "rpmbuild" to build properly. Works fine on redhat 9. YMMV.) svn:r1199
2004-03-02 20:09:30 +01:00
Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.
2012-06-16 18:38:14 +02:00
# Allows to override rpmbuild with rpmbuild-md5 from fedora-packager so that
# building for EL5 won't fail on https://bugzilla.redhat.com/show_bug.cgi?id=490613
RPMBUILD ?= rpmbuild
Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball. Signed-off-by: Ondrej Mikle <ondrej.mikle@gmail.com>
2012-06-15 23:59:35 +02:00
# Use automake's dist-gzip target to build the tarball
dist-rpm: dist-gzip
TIMESTAMP=$$(date +"%Y-%m-%d_%H.%M.%S"); \
RPM_BUILD_DIR=$$(mktemp -d "/tmp/tor-rpm-build-$$TIMESTAMP-XXXX"); \
mkdir -p "$$RPM_BUILD_DIR"/{BUILD,RPMS,SOURCES/"tor-$(VERSION)",SPECS,SRPMS}; \
cp -fa "$(distdir).tar.gz" "$$RPM_BUILD_DIR"/SOURCES/; \
Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.
2012-06-16 18:38:14 +02:00
LIBS=-lrt $(RPMBUILD) -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \
Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball. Signed-off-by: Ondrej Mikle <ondrej.mikle@gmail.com>
2012-06-15 23:59:35 +02:00
cp -fa "$$RPM_BUILD_DIR"/SRPMS/* .; \
cp -fa "$$RPM_BUILD_DIR"/RPMS/* .; \
rm -rf "$$RPM_BUILD_DIR"; \
echo "RPM build finished"; \
#end of dist-rpm
Add Doxygen config file and make target, along with section in HACKING document svn:r1819
2004-05-07 19:03:52 +02:00
Doxygen: stop producing LaTeX. Running doxygen with latex gave us all manner of unicode issues, slowed down the "make doxygen" target by a lot, and added several latex dependencies... all to produce a 4000-page reference manual which is probably not what anybody wanted. Closes ticket 32099.
2019-10-16 15:56:31 +02:00
.PHONY: doxygen
doxygen: Doxyfile
Another attempt to fix Doxygen references in out-of-tree builds This time, we're using cd to run doxygen from inside the source directory, not the build directory at all. This lets us call the source directory ".", which (I hope) both Doxygen 1.8.13 and 1.8.15 will understand. Naturally, this requires a corresponding change in the doxygen configuration so that we are directing the output to the correct place. Fix for 32378.
2019-11-05 14:57:39 +01:00
mkdir -p doc/doxygen
(cd "$(top_srcdir)" && doxygen "$(abs_top_builddir)/Doxyfile")
Normalize whitespace; add a "tell me about all the unnormalized whitespace" target; fix a braino in dirserv.c svn:r2758
2004-11-09 21:04:00 +01:00
Make "make test" depend on "all".
2009-09-22 19:57:00 +02:00
test: all
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
$(top_builddir)/src/test/test
r8936@totoro: nickm | 2006-10-07 21:00:05 -0400 Make "make test" test. svn:r8645
2006-10-08 05:17:24 +02:00
Run shellcheck for stuff in scripts/ as part of 'make check'
2018-12-15 09:47:30 +01:00
shellcheck:
shellcheck: Add shellcheck to the pre-commit hook * Move the shellcheck script from the Makefile to its own script file * Reformat the shellcheck script so it's easier to read and modify * Call the shellcheck script from the pre-commit hook Fixes bug 30967; not in any released version of Tor.
2019-08-30 14:54:05 +02:00
$(top_srcdir)/scripts/maint/checkShellScripts.sh
Run shellcheck for stuff in scripts/ as part of 'make check'
2018-12-15 09:47:30 +01:00
Split a few long lists in Makefiles.
2019-12-04 18:21:53 +01:00
check-local: \
check-spaces \
check-changes \
check-includes \
Remove check-cocci from check-local target. check-cocci is still a good idea -- perhaps as a cron job? But doing it as part of our regular tests has just been confusing, especially to volunteers who shouldn't have to become coccinelle experts in order to get their patches through our CI. Closes #40030.
2020-07-13 15:24:26 +02:00
shellcheck
Run check-spaces when using `make check`
2016-12-15 13:06:01 +01:00
Makefike: Add an IPv6 test to test-network The IPv6 test only runs if IPv6 is available. Also, explicitly use the bridges+hs-v2 network for the IPv4-only test. This network was chutney's default as of January 2020. Closes 33300.
2020-02-13 02:57:36 +01:00
# test-network requires a copy of Chutney in $CHUTNEY_PATH.
# Chutney can be cloned from https://git.torproject.org/chutney.git .
.PHONY: need-chutney-path
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
need-chutney-path:
@if test ! -d "$$CHUTNEY_PATH"; then \
Autodetect CHUTNEY_PATH if chutney is next to tor If the chutney and tor sources are side-by-side in the same parent directory, autodetect the chutney path. Closes ticket 16903. Patch by "teor".
2015-08-27 02:31:35 +02:00
echo '$$CHUTNEY_PATH was not set.'; \
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
if test -d "$(top_srcdir)/../chutney" && \
test -x "$(top_srcdir)/../chutney/chutney"; then \
echo "Assuming test-network.sh will find" \
"$(top_srcdir)/../chutney"; \
Autodetect CHUTNEY_PATH if chutney is next to tor If the chutney and tor sources are side-by-side in the same parent directory, autodetect the chutney path. Closes ticket 16903. Patch by "teor".
2015-08-27 02:31:35 +02:00
else \
echo; \
Makefile: Hide some recursive make logs These logs break up the chutney test output. Part of 33280.
2020-02-14 02:11:09 +01:00
echo "To run these tests," \
"git clone" \
"https://git.torproject.org/chutney.git ;" \
"export CHUTNEY_PATH=\`pwd\`/chutney"; \
Autodetect CHUTNEY_PATH if chutney is next to tor If the chutney and tor sources are side-by-side in the same parent directory, autodetect the chutney path. Closes ticket 16903. Patch by "teor".
2015-08-27 02:31:35 +02:00
exit 1; \
fi \
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
fi
Makefike: Add an IPv6 test to test-network The IPv6 test only runs if IPv6 is available. Also, explicitly use the bridges+hs-v2 network for the IPv4-only test. This network was chutney's default as of January 2020. Closes 33300.
2020-02-13 02:57:36 +01:00
# Run some basic tests using automake's test-driver
.PHONY: test-network
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
# Hide directory path logs from submakes using $(MAKE) -s
Makefike: Add an IPv6 test to test-network The IPv6 test only runs if IPv6 is available. Also, explicitly use the bridges+hs-v2 network for the IPv4-only test. This network was chutney's default as of January 2020. Closes 33300.
2020-02-13 02:57:36 +01:00
test-network:
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-mkdir
@$(MAKE) -s test-network-clean
@$(MAKE) -s test-network-run \
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
ipv4_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK)" \
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
ipv6_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK_IPV6)"
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-results
Add make target test-network running traffic tests in a Chutney network. This implements ticket #8530.
2013-06-05 15:48:57 +02:00
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
# Run all available tests using automake's test-driver
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
.PHONY: test-network-all
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
# Hide directory path logs from submakes using $(MAKE) -s
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-all:
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-mkdir
@$(MAKE) -s test-network-clean
@$(MAKE) -s test-network-run \
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" \
mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" \
Makefile: Add an IPv6 mixed chutney network This network is used in make test-network-all and test-network-ipv6. Closes 33334.
2020-02-17 05:50:24 +01:00
ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \
ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)"
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-results
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
# Run IPv4 and mixed tests using automake's test-driver
.PHONY: test-network-ipv4
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
# Hide directory path logs from submakes using $(MAKE) -s
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-ipv4:
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-mkdir
@$(MAKE) -s test-network-clean
@$(MAKE) -s test-network-run \
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" \
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)"
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-results
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
# Run IPv6 tests using automake's test-driver
.PHONY: test-network-ipv6
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
# Hide directory path logs from submakes using $(MAKE) -s
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-ipv6:
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-mkdir
@$(MAKE) -s test-network-clean
@$(MAKE) -s test-network-run \
Makefile: Add an IPv6 mixed chutney network This network is used in make test-network-all and test-network-ipv6. Closes 33334.
2020-02-17 05:50:24 +01:00
ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" \
ipv6_mixed_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6_MIXED)"
Makefile: Silence some submake logs in test-network These logs split up the chutney SKIP, PASS, and FAIL messages, and they don't actually contain any useful information. Cleanup after 33334.
2020-02-17 13:03:09 +01:00
@$(MAKE) -s test-network-results
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
# Make the test network log directory, if it does not exist
.PHONY: test-network-mkdir
test-network-mkdir:
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
@mkdir -p "$(TEST_NETWORK_ALL_LOG_DIR)"
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
# Clean the test network log directory
.PHONY: test-network-clean
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
# We need to remove all matching files, so we can't quote the glob part of the
# rm arguments
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-clean:
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
rm -f "$(TEST_NETWORK_ALL_LOG_DIR)"/*.log \
"$(TEST_NETWORK_ALL_LOG_DIR)"/*.trs
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
# Run tests using automake's test-driver
# When checking if a set of test can be run, log the type of test, and the
# list of tests that will be run (or skipped).
#
# Run the IPv4 tests in $(ipv4_flavors), unconditionally
# - tor relays and directory authorities require IPv4.
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
# Run the IPv6 tests in $(ipv6_flavors), if IPv6 is available
make: Improve the documentation for test-network-all "make test-network-all" shows the warnings from each test-network.sh run on the console, so developers see new warnings early. Improve the documentation for this feature, and rename a Makefile variable so the code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc.
2019-06-14 03:44:26 +02:00
# - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost)
# we try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
# because they're incompatible
# - some IPv6 tests may fail without an IPv6 DNS server
# (see #16971 and #17011)
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
# Run the mixed tests in $(mixed_flavors), if a tor-stable binary is available
# - only run mixed tests if we have a tor-stable binary
# Run the IPv6 mixed tests in $(ipv6_mixed_flavors), if IPv6 and mixed are run
# - see above for details about IPv6 and mixed
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
.PHONY: test-network-run
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
# We need the word splitting in the "for" lines, so we can't quote
# $(skip_flavors) or $(flavors)
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
@flavors=""; \
skip_flavors=""; \
if test -n "$(ipv4_flavors)"; then \
echo "Running IPv4 flavors: $(ipv4_flavors)."; \
flavors="$$flavors $(ipv4_flavors)"; \
fi; \
test_network_ipv6=false; \
if test -n "$(ipv6_flavors)" || \
test -n "$(ipv6_mixed_flavors)"; then \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || \
ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || \
ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
test_network_ipv6=true; \
fi; \
fi; \
if test -n "$(ipv6_flavors)"; then \
if test "$$test_network_ipv6" = "true"; then \
echo "ping6 ::1 or ping ::1 succeeded, running IPv6" \
"flavors: $(ipv6_flavors)."; \
flavors="$$flavors $(ipv6_flavors)"; \
else \
echo "ping6 ::1 and ping ::1 failed, skipping IPv6" \
"flavors: $(ipv6_flavors)."; \
skip_flavors="$$skip_flavors $(ipv6_flavors)"; \
fi; \
fi; \
test_network_mixed=false; \
if test -n "$(mixed_flavors)" || \
test -n "$(ipv6_mixed_flavors)"; then \
if command -v tor-stable >/dev/null 2>&1; then \
test_network_mixed=true; \
fi; \
fi; \
if test -n "$(mixed_flavors)"; then \
if test "$$test_network_mixed" = "true"; then \
echo "tor-stable found, running mixed flavors:" \
"$(mixed_flavors)."; \
flavors="$$flavors $(mixed_flavors)"; \
else \
echo "tor-stable not found, skipping mixed flavors:" \
"$(mixed_flavors)."; \
skip_flavors="$$skip_flavors $(mixed_flavors)"; \
fi; \
fi; \
if test -n "$(ipv6_mixed_flavors)"; then \
if test "$$test_network_ipv6" = "true" && \
test "$$test_network_mixed" = "true"; then \
echo "Running IPv6 mixed flavors:" \
"$(ipv6_mixed_flavors)."; \
flavors="$$flavors $(ipv6_mixed_flavors)"; \
else \
echo "Skipping IPv6 mixed flavors:" \
"$(ipv6_mixed_flavors)."; \
skip_flavors="$$skip_flavors $(ipv6_mixed_flavors)"; \
fi; \
fi; \
for f in $$skip_flavors; do \
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
echo "SKIP: $$f"; \
done; \
Makefile: Refactor and tweak test-network The refactor is simpler, and supports IPv6 mixed networks. The refactor also slightly changes the order of the IPv6 and mixed checks. But it's closer to the original order before 33280. And if all the network lists that need a network type are empty, we don't check if we can run that network type. (And if a network list is empty, we don't say we're going to run an empty list.) Part of 33334.
2020-02-17 05:26:41 +01:00
for f in $$flavors; do \
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
$(SHELL) "$(top_srcdir)/test-driver" --test-name "$$f" \
--log-file "$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log" \
--trs-file "$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs" \
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
$(TEST_NETWORK_ALL_DRIVER_FLAGS) \
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
"$(top_srcdir)/src/test/test-network.sh" \
--flavor "$$f" $(TEST_NETWORK_FLAGS); \
"$(top_srcdir)/src/test/test-network.sh" \
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
$(TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS); \
done
# Print the results from automake's test-driver
# - show tor warnings on the console after each network run
# (otherwise, warnings go to the logs, and people don't see them unless
# there is a network failure)
.PHONY: test-network-results
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
# We need to grep all matching files, so we can't quote the glob part of the
# grep arguments
Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280.
2020-02-13 01:09:33 +01:00
test-network-results:
Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280.
2020-02-14 01:34:17 +01:00
@echo \
"Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."
@! grep -q FAIL "$(TEST_NETWORK_ALL_LOG_DIR)"/*.trs
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \
make "make test-stem" run stem tests on tor Closes ticket 14107.
2015-01-05 17:52:36 +01:00
echo '$$STEM_SOURCE_DIR was not set.'; echo; \
echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
exit 1; \
make "make test-stem" run stem tests on tor Closes ticket 14107.
2015-01-05 17:52:36 +01:00
fi
Clean up TEST_TOR_BINARY so test-stem can have better dependencies Fix #18240. This version of the bug first appeared in 0.2.8.2-alpha. 0.2.8.1-alpha and earlier had a different bug. Based on a patch from cypherpunks.
2016-04-05 17:47:37 +02:00
test-stem: need-stem-path $(TESTING_TOR_BINARY)
test: Change "make test-stem" so it only runs the stem tests that use tor This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554.
2019-08-29 13:56:16 +02:00
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --integ --test control.controller --test control.base_controller --test process --log notice;
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
Clean up TEST_TOR_BINARY so test-stem can have better dependencies Fix #18240. This version of the bug first appeared in 0.2.8.2-alpha. 0.2.8.1-alpha and earlier had a different bug. Based on a patch from cypherpunks.
2016-04-05 17:47:37 +02:00
test-stem-full: need-stem-path $(TESTING_TOR_BINARY)
@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v;
Improved targets for "run all the tests, no, all of them."
2015-08-03 19:03:58 +02:00
Split a few long lists in Makefiles.
2019-12-04 18:21:53 +01:00
test-full: \
need-stem-path \
need-chutney-path \
check \
test-network \
test-stem
test-full-online: \
need-stem-path \
need-chutney-path \
check \
test-network \
test-stem-full
make "make test-stem" run stem tests on tor Closes ticket 14107.
2015-01-05 17:52:36 +01:00
Makefile: actually, don't delete the gcno files We need to keep the gcno files, because they are created at compile time.
2019-04-05 04:56:29 +02:00
# We can't delete the gcno files, because they are created when tor is compiled
Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am
2013-07-16 07:33:39 +02:00
reset-gcov:
Makefile: delete all the gcov-related files in reset-gcov And fix a comment. See: https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
2019-04-01 05:49:27 +02:00
rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \
$(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am
2013-07-16 07:33:39 +02:00
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
HTML_COVER_DIR=$(top_builddir)/coverage_html
Add coverage-html makefile target This uses lcov to generate a nice HTML report of test code coverage, including branch coverage. Signed-off-by: Kevin Murray <spam@kdmurray.id.au>
2014-07-09 10:37:32 +02:00
coverage-html: all
Warn users trying to generate a coverage report when not configured as such.
2015-03-05 15:48:47 +01:00
if COVERAGE_ENABLED
Tweak coverage-html target - Don't try to rm -rf the directory before we start: somebody might have set it to ~, which would be quite sad. - Always quote the directory name - Use 'make reset-gcov' before running tests. - Use 'make check', not ./src/test/test
2014-07-16 12:01:18 +02:00
test -e "`which lcov`" || (echo "lcov must be installed. See <http://ltp.sourceforge.net/coverage/lcov.php>." && false)
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
test -d "$(HTML_COVER_DIR)" || $(MKDIR_P) "$(HTML_COVER_DIR)"
lcov --rc lcov_branch_coverage=1 --directory $(top_builddir)/src --zerocounters
Tweak coverage-html target - Don't try to rm -rf the directory before we start: somebody might have set it to ~, which would be quite sad. - Always quote the directory name - Use 'make reset-gcov' before running tests. - Use 'make check', not ./src/test/test
2014-07-16 12:01:18 +02:00
$(MAKE) reset-gcov
$(MAKE) check
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
lcov --capture --rc lcov_branch_coverage=1 --no-external --directory $(top_builddir) --base-directory $(top_srcdir) --output-file "$(HTML_COVER_DIR)/lcov.tmp"
Add coverage-html makefile target This uses lcov to generate a nice HTML report of test code coverage, including branch coverage. Signed-off-by: Kevin Murray <spam@kdmurray.id.au>
2014-07-09 10:37:32 +02:00
lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info"
genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info"
Warn users trying to generate a coverage report when not configured as such.
2015-03-05 15:48:47 +01:00
else
@printf "Not configured with --enable-coverage, run ./configure --enable-coverage\n"
endif
Add coverage-html makefile target This uses lcov to generate a nice HTML report of test code coverage, including branch coverage. Signed-off-by: Kevin Murray <spam@kdmurray.id.au>
2014-07-09 10:37:32 +02:00
Disable assertions during coverage builds This removes roughly 5000 branches in my testing. We never want to trigger assertions even during tests, so this is sane. Implements #15400.
2015-03-20 13:12:09 +01:00
coverage-html-full: all
test -e "`which lcov`" || (echo "lcov must be installed. See <http://ltp.sourceforge.net/coverage/lcov.php>." && false)
test -d "$(HTML_COVER_DIR)" || mkdir -p "$(HTML_COVER_DIR)"
lcov --rc lcov_branch_coverage=1 --directory ./src --zerocounters
$(MAKE) reset-gcov
$(MAKE) check
$(MAKE) test-stem-full
Add call to chutney to coverage-html-full target Now make coverage-html-full should be a pretty good approximation of our actual coverage
2015-03-22 04:22:04 +01:00
CHUTNEY_TOR=tor-cov CHUTNEY_TOR_GENCERT=tor-cov-gencert $(top_srcdir)/src/test/test-network.sh
CHUTNEY_TOR=tor-cov CHUTNEY_TOR_GENCERT=tor-cov-gencert $(top_srcdir)/src/test/test-network.sh --flavor hs
Disable assertions during coverage builds This removes roughly 5000 branches in my testing. We never want to trigger assertions even during tests, so this is sane. Implements #15400.
2015-03-20 13:12:09 +01:00
lcov --capture --rc lcov_branch_coverage=1 --no-external --directory . --output-file "$(HTML_COVER_DIR)/lcov.tmp"
lcov --remove "$(HTML_COVER_DIR)/lcov.tmp" --rc lcov_branch_coverage=1 'test/*' 'ext/tinytest*' '/usr/*' --output-file "$(HTML_COVER_DIR)/lcov.info"
genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info"
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
# For scripts: avoid src/ext and src/trunnel.
Makefile/git scripts: Add comments to keep owned file lists in sync
2019-11-26 00:20:57 +01:00
# Keep these lists consistent:
# - OWNED_TOR_C_FILES in Makefile.am
# - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook
# - try_parse in check_cocci_parse.sh
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
OWNED_TOR_C_FILES=\
Make sure check-spaces applies in lib and dirauth.
2018-06-21 20:22:15 +02:00
$(top_srcdir)/src/lib/*/*.[ch] \
Fix our build system to know the new locations of the src/or stuff
2018-07-05 22:52:12 +02:00
$(top_srcdir)/src/core/*/*.[ch] \
$(top_srcdir)/src/feature/*/*.[ch] \
$(top_srcdir)/src/app/*/*.[ch] \
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
$(top_srcdir)/src/test/*.[ch] \
fuzzing: Add copyright notices and whitespace fixes
2016-12-14 23:11:26 +01:00
$(top_srcdir)/src/test/*/*.[ch] \
Remove tor-fw-helper more thoroughly
2015-08-20 20:33:38 +02:00
$(top_srcdir)/src/tools/*.[ch]
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
check-spaces:
if USE_PERL
$(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \
$(OWNED_TOR_C_FILES)
Run check-spaces only when Perl is available Also permit users to override the Perl variable with relative paths.
2016-12-15 13:02:42 +01:00
endif
Normalize whitespace; add a "tell me about all the unnormalized whitespace" target; fix a braino in dirserv.c svn:r2758
2004-11-09 21:04:00 +01:00
Run checkIncludes.py from "make check-includes"
2018-06-21 20:20:43 +02:00
check-includes:
if USEPYTHON
Makefile: Fix "make check-includes" for out-of-tree builds Previously, it would run on the build tree, which did not contain any sources. Fixes bug 31335; bugfix on 0.3.5.1-alpha.
2019-11-06 03:29:35 +01:00
$(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py $(top_srcdir)
Run checkIncludes.py from "make check-includes"
2018-06-21 20:20:43 +02:00
endif
Call practracker as part of check-local. - Introduce 'make check-best-practices'. - Fix up Tor topdir etc to work with the way 'make check-local' gets called. - Make practracker less likely to print useless stuff.
2019-02-28 11:09:10 +01:00
check-best-practices:
if USEPYTHON
practracker: add envvar TOR_PRACTRACKER_OPTIONS We have Makefile.am use this to decide how to invoke practracker on the Tor source.
2019-08-01 18:57:26 +02:00
@$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py $(top_srcdir) $(TOR_PRACTRACKER_OPTIONS)
Call practracker as part of check-local. - Introduce 'make check-best-practices'. - Fix up Tor topdir etc to work with the way 'make check-local' gets called. - Make practracker less likely to print useless stuff.
2019-02-28 11:09:10 +01:00
endif
Makefile: Add check_cocci_parse.sh as check-cocci And add it to check-local. Part of 31919.
2019-10-23 07:44:17 +02:00
check-cocci:
VERBOSE=1 $(top_srcdir)/scripts/coccinelle/check_cocci_parse.sh $(OWNED_TOR_C_FILES)
Add a practracker-regen make target
2019-03-25 21:07:58 +01:00
practracker-regen:
$(PYTHON) $(top_srcdir)/scripts/maint/practracker/practracker.py --regen $(top_srcdir)
Make `check-docs` work from out-of-tree builds.
2015-03-11 10:47:13 +01:00
check-docs: all
$(PERL) $(top_builddir)/scripts/maint/checkOptionDocs.pl
r11651@Kushana: nickm | 2006-12-20 12:05:04 -0500 Add a maintainer script and a new make target "make check-docs" to get a quick dump of which options are undocumented where, and which documentation refers to nonexistent options. svn:r9160
2006-12-20 18:05:48 +01:00
r9021@Kushana: nickm | 2006-09-29 16:58:41 -0400 Add a perl script and a make target to find and check for duplicate log messages at level notice or higher. svn:r8539
2006-09-30 00:33:28 +02:00
check-logs:
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
$(top_srcdir)/scripts/maint/checkLogs.pl \
$(top_srcdir)/src/*/*.[ch] | sort -n
r8936@totoro: nickm | 2006-10-07 21:00:05 -0400 Make "make test" test. svn:r8645
2006-10-08 05:17:24 +02:00
Add spell check to makefile to check for typos ticket#25024 - Use misspell to check for typos in codebase - Add `make check-typos` to run the checks - Add `check-typos` to `make check`
2018-01-29 23:03:01 +01:00
.PHONY: check-typos
check-typos:
@if test -x "`which misspell 2>&1;true`"; then \
echo "Checking for Typos ..."; \
add changes file and update check-typos in makefile
2018-04-14 21:35:49 +02:00
(misspell \
$(top_srcdir)/src/[^e]*/*.[ch] \
Add spell check to makefile to check for typos ticket#25024 - Use misspell to check for typos in codebase - Add `make check-typos` to run the checks - Add `check-typos` to `make check`
2018-01-29 23:03:01 +01:00
$(top_srcdir)/doc \
$(top_srcdir)/contrib \
$(top_srcdir)/scripts \
$(top_srcdir)/README \
$(top_srcdir)/ChangeLog \
$(top_srcdir)/INSTALL \
$(top_srcdir)/ReleaseNotes \
$(top_srcdir)/LICENSE); \
else \
echo "Tor can use misspell to check for typos."; \
echo "It seems that you don't have misspell installed."; \
echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install"; \
fi
add make check-rustfmt
2018-08-06 16:45:13 +02:00
.PHONY: rustfmt
rustfmt:
if USE_RUST
@if test -x "`which cargo-fmt 2>&1;true`"; then \
echo "Formatting Rust code ..."; \
(cd "$(top_srcdir)/src/rust" && cargo fmt --all --); \
else \
echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
echo "However, it seems that you don't have rustfmt installed."; \
printf "You can install rustfmt by following the directions here:"; \
echo " https://github.com/rust-lang-nursery/rustfmt"; \
fi
endif
.PHONY: check-rustfmt
check-rustfmt:
if USE_RUST
@if test -x "`which cargo-fmt 2>&1;true`"; then \
printf "Running rustfmt..."; \
(cd "$(top_srcdir)/src/rust" && cargo fmt --all -- --check && echo "done.") || \
(echo "**************** check-rustfmt failed. ****************"; \
echo " Run \`make rustfmt\` to apply the above changes."; \
exit 1); \
else \
echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
echo "However, it seems that you don't have rustfmt installed."; \
printf "You can install rustfmt by following the directions here:"; \
echo " https://github.com/rust-lang-nursery/rustfmt"; \
fi
endif
build: Add `make clippy` option for Rust linting. Note that clippy is quite loud/obnoxious, as its name would imply. This target isn't meant to run on CI, or even necessarily exit cleanly. It's merely a way for developers to check if they've made any glaring mistakes, or done awkward things they might not have otherwise realised. We *can* configure it to be quieter in the future, but it's probably not worth rabbitholing on. * CLOSES #22156: https://bugs.torproject.org/22156
2018-06-11 21:16:43 +02:00
.PHONY: clippy
clippy:
if USE_RUST
@if test -x "`which cargo-clippy 2>&1;true`"; then \
echo "Running cargo clippy ..."; \
echo "Prepare yourself for the onslaught of suggestions ..."; \
(cd "$(top_srcdir)/src/rust" && cargo clippy); \
else \
echo "Tor can use clippy to lint Rust code."; \
echo "However, it seems that you don't have clippy installed."; \
echo "You can install the latest version of clippy by following the directions here: https://github.com/rust-lang-nursery/rust-clippy"; \
fi
endif
Add `check-changes` rule for checking formatting of changes files. Additional fixes to make the change work; - fix Python 2 vs 3 issues - fix some PEP 8 warnings - handle paths with numbers correctly - mention the make rule in doc/HACKING.
2015-03-06 11:56:57 +01:00
.PHONY: check-changes
check-changes:
Whoops; only run lintchanges when usepython
2017-09-21 23:32:17 +02:00
if USEPYTHON
Add `check-changes` rule for checking formatting of changes files. Additional fixes to make the change work; - fix Python 2 vs 3 issues - fix some PEP 8 warnings - handle paths with numbers correctly - mention the make rule in doc/HACKING.
2015-03-06 11:56:57 +01:00
@if test -d "$(top_srcdir)/changes"; then \
check-changes: Warn about bugfixes on future releases Warn when bugfix changes files say that the bug is in a future release. Closes ticket 27761.
2018-09-18 12:39:03 +02:00
PACKAGE_VERSION=$(PACKAGE_VERSION) $(PYTHON) $(top_srcdir)/scripts/maint/lintChanges.py $(top_srcdir)/changes; \
Add `check-changes` rule for checking formatting of changes files. Additional fixes to make the change work; - fix Python 2 vs 3 issues - fix some PEP 8 warnings - handle paths with numbers correctly - mention the make rule in doc/HACKING.
2015-03-06 11:56:57 +01:00
fi
Whoops; only run lintchanges when usepython
2017-09-21 23:32:17 +02:00
endif
Add `check-changes` rule for checking formatting of changes files. Additional fixes to make the change work; - fix Python 2 vs 3 issues - fix some PEP 8 warnings - handle paths with numbers correctly - mention the make rule in doc/HACKING.
2015-03-06 11:56:57 +01:00
Revive updateVersions.pl with `make update-versions`.
2015-03-12 09:28:41 +01:00
.PHONY: update-versions
update-versions:
Rewrite updateVersions script in Python, add datestamp functionality. This updateVersions.pl script was one of the only essential perl scripts left in out maint system, and was the only one that used autoconf to fill in the script. This script adds a feature to define an APPROX_RELEASE_DATE macro that is updated when the version changes. We'll use this to implement prop297, so that we have an accurate view of when a release date happens.
2018-11-25 02:03:48 +01:00
abs_top_srcdir="$(abs_top_srcdir)" $(PYTHON) $(top_srcdir)/scripts/maint/update_versions.py
Revive updateVersions.pl with `make update-versions`.
2015-03-12 09:28:41 +01:00
Add support for running "calltool" on Tor via "make callgraph". Closes #19307.
2017-09-07 16:51:02 +02:00
.PHONY: callgraph
callgraph:
Makefile: Fix more targets for out-of-tree builds Support callgraph and rectify-includes in out-of-tree builds. Part of 32522.
2019-11-16 10:57:22 +01:00
cd $(top_builddir); $(abs_top_srcdir)/scripts/maint/run_calltool.sh
Add support for running "calltool" on Tor via "make callgraph". Closes #19307.
2017-09-07 16:51:02 +02:00
Basic support for a "make version" target to declare the source version This is katmagic's idea. See issue 4400.
2011-11-25 05:53:18 +01:00
version:
@echo "Tor @VERSION@"
@if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; then \
echo -n "git: " ;\
(cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \
fi
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
.PHONY: autostyle-ifdefs
autostyle-ifdefs:
Makefile: Fix "make autostyle" for out-of-tree builds Fixes bug 32370; bugfix on 0.4.1.2-alpha.
2019-11-05 02:56:14 +01:00
$(PYTHON) $(top_srcdir)/scripts/maint/annotate_ifdef_directives.py $(OWNED_TOR_C_FILES)
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
.PHONY: autostyle-ifdefs
autostyle-operators:
Makefile: Fix "make autostyle" for out-of-tree builds Fixes bug 32370; bugfix on 0.4.1.2-alpha.
2019-11-05 02:56:14 +01:00
$(PERL) $(top_srcdir)/scripts/coccinelle/test-operator-cleanup $(OWNED_TOR_C_FILES)
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
.PHONY: rectify-includes
rectify-includes:
Makefile: Fix more targets for out-of-tree builds Support callgraph and rectify-includes in out-of-tree builds. Part of 32522.
2019-11-16 10:57:22 +01:00
cd $(top_srcdir); $(PYTHON) $(abs_top_srcdir)/scripts/maint/rectify_include_paths.py
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
.PHONY: update-copyright
update-copyright:
Makefile: Fix "make autostyle" for out-of-tree builds Fixes bug 32370; bugfix on 0.4.1.2-alpha.
2019-11-05 02:56:14 +01:00
$(PERL) $(top_srcdir)/scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)
Add a new "autostyle" make target to run all of our reformatting Closes ticket 30539.
2019-05-20 18:08:30 +02:00
.PHONY: autostyle
autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes
Coverage support: build with --enable-coverage to have tests run with gcov If you pass the --enable-coverage flag on the command line, we build our testing binaries with appropriate options eo enable coverage testing. We also build a "tor-cov" binary that has coverage enabled, for integration tests. On recent OSX versions, test coverage only works with clang, not gcc. So we warn about that. Also add a contrib/coverage script to actually run gcov with the appropriate options to generate useful .gcov files. (Thanks to automake, the .o files will not have the names that gcov expects to find.) Also, remove generated gcda and gcno files on clean.
2013-07-09 18:37:11 +02:00
mostlyclean-local:
Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs - Doxygen - coverage-html And cleans up additional directories; - coverage_html - doc/doxygen
2015-02-17 15:36:10 +01:00
rm -f $(top_builddir)/src/*/*.gc{da,no} $(top_builddir)/src/*/*/*.gc{da,no}
rm -rf $(HTML_COVER_DIR)
rm -rf $(top_builddir)/doc/doxygen
Add "make test-network-all" to verify multiple test networks make test-network-all is Makefile target which verifies a series of test networks generated using test-network.sh and chutney. It runs IPv6 and mixed version test networks if the prerequisites are available. Each test network reports PASS, FAIL, or SKIP. Closes ticket 16953. Patch by "teor". Also adds "--hs-multi-client 1" option to TEST_NETWORK_FLAGS. This resolves #17012. Larger networks, such as bridges+hs, may fail until #16952 is merged.
2015-09-08 14:27:59 +02:00
rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
Add some Rust utility functions and print support This gives an indication in the log that Tor was built with Rust support, as well as laying some groundwork for further string-returning APIs to be converted to Rust
2017-04-29 09:15:14 +02:00
clean-local:
rm -rf $(top_builddir)/src/rust/target
Allow Rust build using locally supplied crates or crates.io This adds a couple of configure commands to control whether we're requiring all dependencies to be available locally (default) or not (--enable-cargo-online-mode). When building from a tarball, we require the RUST_DEPENDENCIES variable to point to the local repository of crates. This also adds src/ext/rust as a git submodule that contains such a local repository for easy setup.
2017-05-02 04:21:42 +02:00
rm -rf $(top_builddir)/src/rust/.cargo/registry
Make distcleancheck pass with --enable-rust
2017-10-27 18:35:13 +02:00
if USE_RUST
distclean-local: distclean-rust
endif
Show test-suite.log for distcheck on Travis CI When Travis CI runs make distcheck, test-suite.log doesn't exist in the expected place. Add a new make target to show this file and use it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any released Tor.
2018-04-26 21:22:52 +02:00
# This relies on some internal details of how automake implements
# distcheck. We check two directories because automake-1.15 changed
# from $(distdir)/_build to $(distdir)/_build/sub.
show-distdir-testlog:
@if test -d "$(distdir)/_build/sub"; then \
cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \
else \
cat $(distdir)/_build/$(TEST_SUITE_LOG); fi
Add make targets to show static libraries. These might make it easier for people to link our stuff, and keep their scripts more robust.
2018-07-01 16:08:54 +02:00
report origin of mystery core file Report what program produced the mysterious core file that we occasionally see on Travis CI during make distcheck. Closes ticket 28024.
2018-10-12 03:25:41 +02:00
# Similarly, this relies on automake internals to run file on an
# intermittent core file whose provenance is not known to us. See
# ticket 26787.
show-distdir-core:
@if test -d "$(distdir)/_build/sub"; then \
file $(distdir)/_build/sub/core ; \
else \
file $(distdir)/_build/core; fi
Add make targets to show static libraries. These might make it easier for people to link our stuff, and keep their scripts more robust.
2018-07-01 16:08:54 +02:00
show-libs:
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
@echo libtor.a
Add make targets to show static libraries. These might make it easier for people to link our stuff, and keep their scripts more robust.
2018-07-01 16:08:54 +02:00
show-testing-libs:
Build one big .a library full of Tor's implementation. This is experimental and probably will break some platforms
2020-09-18 18:17:02 +02:00
@echo src/test/libtor-testing.a
Reference in New Issue Copy Permalink