From 994153748145be91f0001f96cb03a526037e55f4 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 15 Nov 2019 09:41:46 -0800
Subject: [PATCH] Run doctest unit tests in Travis CI

---
 testing/scripts/travis-job | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index d3e5cac9f5..bd759ba474 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -165,7 +165,7 @@ build() {
     # not needed by the Zeek tests. If the distro is set for leak tests, enable
     # those options as well.
     if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
-	./configure --build-type=Release --disable-broker-tests --disable-python --disable-zeekctl && make -j 2
+        ./configure --build-type=Release --disable-broker-tests --enable-cpp-tests --disable-python --disable-zeekctl && make -j 2
     else
         echo "Configuring zeek to build for leak testing"
         ./configure --build-type=Debug --disable-broker-tests --disable-python --disable-zeekctl --enable-perftools --enable-perftools-debug && make -j 2
@@ -207,8 +207,25 @@ run() {
 
     ulimit -c unlimited
     ulimit -a
+    ret=0
+
+    if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
+        echo
+        echo "Running unit tests ##################################################"
+        echo
+
+        set +e
+        ( cd build && . ./zeek-path-dev.sh && zeek --test )
+
+        if [ $? -ne 0 ]; then
+            ret=1
+        fi
+
+        set -e
+    fi
+
     echo
-    echo "Running unit tests ##################################################"
+    echo "Running baseline tests ##############################################"
     echo
     cd testing/btest
 
@@ -220,7 +237,10 @@ run() {
         ../../aux/btest/btest -j 4 -d -g leaks
     fi
 
-    ret=$?
+    if [ $? -ne 0 ]; then
+        ret=1
+    fi
+
     set -e
 
     echo