summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-23 13:49:50 +1000
committerteor <teor@torproject.org>2019-10-25 16:08:40 +1000
commitc3ff5ad56b3792edd922d776fc36447b69d68854 (patch)
treecffd1c4a2fe24661f64a591059a421c12941bbaa /.travis.yml
parentba64caee87146a8eda1b2b229236040d46d0f076 (diff)
downloadtor-c3ff5ad56b3792edd922d776fc36447b69d68854.tar.gz
tor-c3ff5ad56b3792edd922d776fc36447b69d68854.zip
Travis: Install coccinelle on macOS and Linux
And print the spatch version and build details Part of 31919.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index a5f4be1f19..fe0f6d49c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,6 +109,8 @@ addons:
- libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
#- libzstd
+ ## Optional build dependencies
+ - coccinelle
- shellcheck
## Conditional build dependencies
## Always installed, so we don't need sudo
@@ -138,6 +140,7 @@ addons:
- pkg-config
## Optional build dependencies
- ccache
+ - coccinelle
- shellcheck
## Conditional build dependencies
## Always installed, because manual brew installs are hard to get right
@@ -194,6 +197,9 @@ install:
- if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi
## If we're running stem, show the stem version and commit
- if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
+ ## Get the coccinelle version
+ ## Installs are unreliable on macOS, so we just rely on brew list --versions
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then spatch --version; fi
## We don't want Tor tests to depend on default configuration file at
## ~/.torrc. So we put some random bytes in there, to make sure we get build
## failures in case Tor is reading it during CI jobs.