diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-28 08:15:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-28 08:15:21 -0500 |
| commit | 99671c0dae42b3b7ffbccada518d241641773bb2 (patch) | |
| tree | 43e0b476bd0965c8bda03af1a44d66f7a11282a8 /.travis.yml | |
| parent | 27099ffe6a6db70f08bd1d06b602d7313053c399 (diff) | |
| parent | a207fd7226c63c97fbf375a5e4c47773d00be393 (diff) | |
| download | tor-99671c0dae42b3b7ffbccada518d241641773bb2.tar.gz tor-99671c0dae42b3b7ffbccada518d241641773bb2.zip | |
Merge remote-tracking branch 'tor-github/pr/1680'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 6792c47ad4..af5052682f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,8 @@ matrix: os: osx ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## We run `make doxygen` without `make check`. + - env: SKIP_MAKE_CHECK="yes" DOXYGEN="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@ -127,6 +129,7 @@ addons: - docbook-xsl - docbook-xml - xmlto + - doxygen ## Utilities ## preventing or diagnosing hangs - timelimit @@ -231,6 +234,7 @@ script: ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes ## Travis will kill the job after 10 minutes with no output - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; fi + - if [[ "$DOXYGEN" != "" ]]; then make doxygen; 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 |