diff options
| author | teor <teor@torproject.org> | 2019-12-20 10:12:30 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-12-20 10:12:30 +1000 |
| commit | 38cc3a45b655a07f8834ddcd1514f04b09bd80a0 (patch) | |
| tree | 3b9c269328111e3a06ab80e8cf24e3aa2c1e4fa0 | |
| parent | 95caab8cc6962066a20390282afdd70ba6e6ec2b (diff) | |
| parent | 37b04aeed7d6c7acb8b7edf2bcd6ee08f9c3a54c (diff) | |
| download | tor-release-0.2.9.tar.gz tor-release-0.2.9.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9release-0.2.9
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | changes/ticket32240 | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6004727b6d..a67b8b92fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,9 @@ env: - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are + ## triggered by Ubuntu Xenial and Bionic. See #32722. + - CHUTNEY_TOR_SANDBOX="0" matrix: ## This matrix entry is required, but it doesn't actually create any jobs - @@ -38,10 +41,6 @@ matrix: ## Use -std=gnu99 to turn off some newer features, and maybe turn on some ## extra gcc warnings? - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" C_DIALECT_OPTIONS="-std=gnu99" - ## (Linux only) Use an older Linux image (Ubuntu Trusty) - ## The Xenial and Bionic images cause permissions issues for chutney, - ## this is a workaround, until we fix #32240. - dist: trusty ## We check asciidoc with distcheck, to make sure we remove doc products ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" diff --git a/changes/ticket32240 b/changes/ticket32240 new file mode 100644 index 0000000000..35cc3df27e --- /dev/null +++ b/changes/ticket32240 @@ -0,0 +1,4 @@ + o Testing: + - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on Ubuntu + Bionic. Turning off the Sandbox is a work-around, until we fix the + sandbox errors in 32722. Closes ticket 32240. |