diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-02-27 07:59:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-12 08:55:38 -0400 |
| commit | 63325c05964ca5906aad4b51a53a5dc471fc7347 (patch) | |
| tree | a5086cd571843c60904f763c27d06d27dfe6b3f6 | |
| parent | b0826346a64e58b81e00ec6fcb0d2b75b302c0d3 (diff) | |
| download | tor-63325c05964ca5906aad4b51a53a5dc471fc7347.tar.gz tor-63325c05964ca5906aad4b51a53a5dc471fc7347.zip | |
Add a chutney mode to travis.yml.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | changes/chutney_ci | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a6727923d0..a8ad1f122f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,10 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + # We also try running a hardened clang build with chutney on Linux. + - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + compiler: clang + os: linux ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -142,7 +146,8 @@ install: - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi - ## + ## If we're running chutney, install it. + - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi @@ -155,6 +160,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi diff --git a/changes/chutney_ci b/changes/chutney_ci new file mode 100644 index 0000000000..b17d587329 --- /dev/null +++ b/changes/chutney_ci @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis configuration now uses Chutney to run some network + integration tests automatically. Closes ticket 29280. |