tor

commit 99671c0dae42b3b7ffbccada518d241641773bb2
parent 27099ffe6a6db70f08bd1d06b602d7313053c399
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 28 Jan 2020 08:15:21 -0500

Merge remote-tracking branch 'tor-github/pr/1680'

Diffstat:
M
.travis.yml
 | 
4
++++
A
changes/ticket32455
 | 
2
++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git 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
 
diff --git a/changes/ticket32455 b/changes/ticket32455
@@ -0,0 +1,2 @@
+  o Minor features (continuous integration):
+    - Run Doxygen Makefile target on Travis. Closes ticket 32455.