torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.6' into main

Browse Source
This commit is contained in:
Alexander Færøy
2021-10-25 21:03:14 +00:00
parent 91c83d1e08 0c5128eeb2
commit 04788dcf40
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/ticket40500
+3
View File
@@ -0,0 +1,3 @@
o Minor bugfix (CI, onion service):
- Exclude onion service version 2 Stem tests in our CI. Fixes bug 40500;
bugfix on 0.3.2.1-alpha.
scripts/ci/ci-driver.sh
+3 -4
View File
@@ -467,10 +467,9 @@ fi
if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
EXCLUDE_TESTS=""
if [[ "${TOR_VER_AT_LEAST_046}" = 'yes' ]]; then
EXCLUDE_TESTS="--exclude-test control.controller.test_ephemeral_hidden_services_v2 --exclude-test control.controller.test_hidden_services_conf --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth --exclude-test control.controller.test_without_ephemeral_hidden_services --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth_no_credentials"
fi
# 0.3.5 and onward have now disabled onion service v2 so we need to exclude
# these Stem tests from now on.
EXCLUDE_TESTS="--exclude-test control.controller.test_ephemeral_hidden_services_v2 --exclude-test control.controller.test_hidden_services_conf --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth --exclude-test control.controller.test_without_ephemeral_hidden_services --exclude-test control.controller.test_with_ephemeral_hidden_services_basic_auth_no_credentials"
if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
# XXXX This should probably be part of some test-stem make target.