From: Guy Harris Date: Sun, 21 Jan 2018 21:29:21 +0000 (-0800) Subject: The build step is the same with autotools and CMake. X-Git-Tag: libpcap-1.9-bp~277 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/9575212322d2263d6b9bded14a2cfbcdb05cf110 The build step is the same with autotools and CMake. --- diff --git a/.travis.yml b/.travis.yml index cfac32e9..ba839cdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,7 @@ script: - if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$CMAKE" = yes ]; then cd build; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$CMAKE" = yes ]; then cmake -DCMAKE_INSTALL_PREFIX=/tmp $ENABLE_REMOTE ..; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then echo -n travis_fold:end:script.configure; fi - - if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$CMAKE" = no ]; then make -s all tests; fi - - if [ "$COVERITY_SCAN_BRANCH" != 1 -a "$CMAKE" = yes ]; then make -s all tests; fi + - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -s all tests; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then echo '$ make install [...]' && echo -n travis_fold:start:script.make_install; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then PATH=$PATH make install; fi - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then echo -n travis_fold:end:script.make_install; fi