aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-09-18 19:06:16 -0400
committerNick Mathewson <nickm@torproject.org>2020-09-18 19:06:16 -0400
commit09813fe31e506daf16fe29d830aef848f16ac18f (patch)
treea7860ee2cd9d1df202ea8f1735c7f127d54b8858 /scripts
parent2e3603d96d156348b2c591a28b8861babfd53ddd (diff)
parentb643ced0224268dfe3d9c3617b3a77f8aec6205e (diff)
downloadtor-09813fe31e506daf16fe29d830aef848f16ac18f.tar.gz
tor-09813fe31e506daf16fe29d830aef848f16ac18f.zip
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/ci-driver.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 527bba82e5..cd91a91bbf 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}"
RUST="${RUST:-no}"
DOXYGEN="${DOXYGEN:-no}"
ASCIIDOC="${ASCIIDOC:-no}"
+TRACING="${TRACING:-no}"
# Options for which tests to run. All should be yes/no.
CHECK="${CHECK:-yes}"
@@ -191,6 +192,7 @@ yes_or_no COVERAGE
yes_or_no RUST
yes_or_no DOXYGEN
yes_or_no ASCIIDOC
+yes_or_no TRACING
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
@@ -241,6 +243,9 @@ fi
if [[ "$ASCIIDOC" != "yes" ]]; then
configure_options+=("--disable-asciidoc")
fi
+if [[ "$TRACING" == "yes" ]]; then
+ configure_options+=("--enable-tracing-instrumentation-lttng")
+fi
#############################################################################
# Tell the user about our versions of different tools and packages.