From: Jason Ish <ish@unx.ca>
Date: Thu, 1 Mar 2018 13:42:09 +0000 (-0600)
Subject: travis: redirect unittest output to file in all builds
X-Git-Tag: suricata-4.1.0-beta1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1115eb52eb546fad87fe10b5c9b183ca440ad735;p=thirdparty%2Fsuricata.git

travis: redirect unittest output to file in all builds

On error, print the last 500 lines of output then exit 1.

Shoud allow us to see why a build fail on the debug tests,
when the error was burried in an output file we weren't
making visible.
---

diff --git a/.travis.yml b/.travis.yml
index 8cea3e60ee..84a67660e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,17 +168,21 @@ script:
             --with-libnspr-includes=/usr/local/opt/nspr/include/nspr \
             --with-libnspr-libraries=/usr/local/opt/nspr/lib
     fi
-  # With debug enabled too much output is generated for Travis, so
-  # redirect stderr to a file.
   - |
     # Linux container builds have 2 cores, make use of them.
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
         j="-j 2"
     fi
-    if [[ "$ENABLE_DEBUG" == "yes" ]]; then
-        make ${j} check 2> stderr.log
-    else
-        make ${j} check
+    make ${j}
+  - |
+    # Like "make check", but fail on first error. We redirect the output
+    # so Travis doesn't fail the build with a too much output error.
+    mkdir -p ./qa/log
+    ./src/suricata -u -l ./qa/log --fatal-unittests > unittests.log 2>&1
+    if [[ $? -ne 0 ]]; then
+        echo "Unit tests failed, last 500 lines of output are:"
+        tail -n 500 unittests.log
+        exit 1
     fi
   - |
     if [[ "$DO_DISTCHECK" == "yes" ]]; then