diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-09-21 12:59:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-09-21 12:59:03 -0400 |
| commit | 0d78fbb718ae44aaf739ec644e7d5f3ae65771ea (patch) | |
| tree | fa4469e380f846420c8c1413b321a84944b8f74c /scripts | |
| parent | b643ced0224268dfe3d9c3617b3a77f8aec6205e (diff) | |
| parent | 8458c8211ec3755400933edc6287baa810f5f695 (diff) | |
| download | tor-0d78fbb718ae44aaf739ec644e7d5f3ae65771ea.tar.gz tor-0d78fbb718ae44aaf739ec644e7d5f3ae65771ea.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.3
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/ci-driver.sh | 20 |
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. |