Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
orbea
Tor
Commits
6e6ad442
Commit
6e6ad442
authored
4 years ago
by
David Goulet
Browse files
Options
Downloads
Patches
Plain Diff
test: Exclude HSv2 test from Stem CI driver
Signed-off-by:
David Goulet
<
dgoulet@torproject.org
>
parent
8577243c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/ci/ci-driver.sh
+20
-1
20 additions, 1 deletion
scripts/ci/ci-driver.sh
with
20 additions
and
1 deletion
scripts/ci/ci-driver.sh
+
20
−
1
View file @
6e6ad442
...
...
@@ -293,6 +293,7 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
# Tor version. Only create the variables we need.
TOR_VER_AT_LEAST_043
=
no
TOR_VER_AT_LEAST_044
=
no
TOR_VER_AT_LEAST_046
=
no
# These are the currently supported Tor versions; no need to work with anything
# ancient in this script.
...
...
@@ -309,10 +310,19 @@ case "$TOR_VERSION" in
TOR_VER_AT_LEAST_043
=
yes
TOR_VER_AT_LEAST_044
=
no
;;
*
)
0.4.4.
*
)
TOR_VER_AT_LEAST_043
=
yes
TOR_VER_AT_LEAST_044
=
yes
;;
0.4.5.
*
)
TOR_VER_AT_LEAST_043
=
yes
TOR_VER_AT_LEAST_044
=
yes
;;
0.4.6.
*
)
TOR_VER_AT_LEAST_043
=
yes
TOR_VER_AT_LEAST_044
=
yes
TOR_VER_AT_LEAST_046
=
yes
;;
esac
#############################################################################
...
...
@@ -460,12 +470,21 @@ 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
if
[[
"
${
TOR_VER_AT_LEAST_044
}
"
=
'yes'
]]
;
then
# XXXX This should probably be part of some test-stem make target.
# Disable the check around EXCLUDE_TESTS that requires double quote. We
# need it to be expanded.
# shellcheck disable=SC2086
if
runcmd timelimit
-p
-t
520
-s
USR1
-T
30
-S
ABRT
\
python3
"
${
STEM_PATH
}
/run_tests.py"
\
--tor
src/app/tor
\
--integ
--test
control.controller
\
$EXCLUDE_TESTS
\
--test
control.base_controller
\
--test
process
\
--log
TRACE
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment