]> granicus.if.org Git - json-c/commitdiff
install doxygen so 'make distcheck' can succeed
authorandy5995 <andy400-dev@yahoo.com>
Wed, 24 Jul 2019 19:20:07 +0000 (14:20 -0500)
committerandy5995 <andy400-dev@yahoo.com>
Sat, 27 Jul 2019 03:24:12 +0000 (22:24 -0500)
.travis.yml

index acad3fd2ad899526ccbd060bc0ac606a6eb65db3..0ec1da656d60c82751c42852406698c61604cd33 100644 (file)
@@ -1,4 +1,4 @@
-language: c\r
+language: cpp\r
 cache: ccache\r
 matrix:\r
 # gcc\r
@@ -11,6 +11,7 @@ matrix:
           packages:\r
             - valgrind\r
             - cppcheck\r
+            - doxygen\r
       env: CHECK="true"\r
     - os: linux\r
       dist: xenial\r
@@ -49,7 +50,8 @@ matrix:
           packages:\r
             - clang-6.0\r
             - cppcheck\r
-      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"\r
+            - doxygen\r
+      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" CHECK="true"\r
     # The default clang on xenial is clang 7.0\r
     - os: linux\r
       dist: xenial\r
@@ -88,15 +90,17 @@ before_script:
 \r
 script:\r
   - make\r
-\r
-after_success:\r
   - if [ -n "$CHECK" ]; then\r
-      make distcheck;\r
+      if [ "$TRAVIS_OS_NAME" = "osx" ]; then\r
+        brew install doxygen;\r
+      fi;\r
+      make check;\r
       result=$?;\r
       if [ $result != 0 ]; then\r
         cat tests/*.log;\r
         exit $result;\r
       fi;\r
+      make distcheck;\r
       if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi;\r
     fi\r
 \r