aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-09-21 09:20:40 -0400
committerNick Mathewson <nickm@torproject.org>2020-09-21 12:58:49 -0400
commit1bbeddf99ef443a647569c27adfa83c7972beb0f (patch)
tree0421546d32dcbd6f2211ac56e006535e34a5b2cb /scripts
parent0b77c706a1799d2ee6d8da4737bb7f152140e3c4 (diff)
downloadtor-1bbeddf99ef443a647569c27adfa83c7972beb0f.tar.gz
tor-1bbeddf99ef443a647569c27adfa83c7972beb0f.zip
Add a few more options for the CI script.
These are: --disable-module-relay --disable-module-dirauth --enable-all-bugs-are-fatal --enable-nss
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/ci-driver.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index cd91a91bbf..67a95a1f61 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -34,6 +34,10 @@ RUST="${RUST:-no}"
DOXYGEN="${DOXYGEN:-no}"
ASCIIDOC="${ASCIIDOC:-no}"
TRACING="${TRACING:-no}"
+ALL_BUGS_ARE_FATAL="${ALL_BUGS_ARE_FATAL:-no}"
+DISABLE_DIRAUTH="${DISABLE_DIRAUTH:-no}"
+DISABLE_RELAY="${DISABLE_RELAY:-no}"
+NSS="${NSS:-no}"
# Options for which tests to run. All should be yes/no.
CHECK="${CHECK:-yes}"
@@ -193,6 +197,10 @@ yes_or_no RUST
yes_or_no DOXYGEN
yes_or_no ASCIIDOC
yes_or_no TRACING
+yes_or_no ALL_BUGS_ARE_FATAL
+yes_or_no DISABLE_DIRAUTH
+yes_or_no DISABLE_RELAY
+yes_or_no NSS
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
@@ -246,6 +254,18 @@ fi
if [[ "$TRACING" == "yes" ]]; then
configure_options+=("--enable-tracing-instrumentation-lttng")
fi
+if [[ "$ALL_BUGS_ARE_FATAL" == "yes" ]]; then
+ configure_options+=("--enable-all-bugs-are-fatal")
+fi
+if [[ "$DISABLE_DIRAUTH" == "yes" ]]; then
+ configure_options+=("--disable-module-dirauth")
+fi
+if [[ "$DISABLE_RELAY" == "yes" ]]; then
+ configure_options+=("--disable-module-relay")
+fi
+if [[ "$NSS" == "yes" ]]; then
+ configure_options+=("--enable-nss")
+fi
#############################################################################
# Tell the user about our versions of different tools and packages.