From cd6e541e3e04de92b1b641d683d7fdc5f5700faf Mon Sep 17 00:00:00 2001
From: Daniel Thayer <dnthayer@illinois.edu>
Date: Thu, 5 Apr 2018 14:10:04 -0500
Subject: [PATCH 1/2] Remove unneeded lines from .travis.yml

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 076e405e75..aff55355c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,10 @@ compiler:
 addons:
   ssh_known_hosts: git.bro.org
   apt:
-    sources:
-      - ubuntu-toolchain-r-test
     packages:
-      - bison
-      - cmake
-      - flex
       - libpcap-dev
       - libssl-dev
-      - python-dev
       - swig
-      - zlib1g-dev
 
 branches:
   only:

From 8c91cafad87638f553f513454689ef74c8418b02 Mon Sep 17 00:00:00 2001
From: Daniel Thayer <dnthayer@illinois.edu>
Date: Thu, 5 Apr 2018 14:12:24 -0500
Subject: [PATCH 2/2] Trim the Travis CI build log output

Remove some output from the Travis CI build log to make it easier
to read.

There is an issue with Travis CI when using encrypted environment
variables.  In this case, when btest calls the python function
sys.stdout.isatty() it returns False, which causes btest to output one
line for each test (passed or failed).  As a result, it is difficult to
see at a glance which tests failed.  Switching to btest brief output to
address this issue.
---
 testing/scripts/travis-job | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index 95605eef1f..533cb75d02 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -48,7 +48,7 @@ run_coverity() {
 
 run() {
     # Run the tests, but don't exit upon failure.
-    make -C testing/btest btest-verbose
+    make -C testing/btest btest-brief
     ret=$?
 
     set -e
@@ -74,9 +74,10 @@ run() {
 }
 
 failure() {
-    # Output each diag.log that contains failed test results.
+    # Output each diag.log that contains failed test results, but don't show
+    # skipped tests.
     for i in testing/btest/diag.log testing/external/bro-testing/diag.log; do
-        grep -qs '... failed$' $i && cat $i ;
+        grep -qs '... failed$' $i && grep -v "... not available, skipped" $i ;
     done
 }