Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Trim the Travis CI build log output
  Remove unneeded lines from .travis.yml

.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:

CHANGES

@@ -1,4 +1,10 @@
 
+2.5-504 | 2018-04-06 10:51:19 -0700
+
+  * Trim the Travis CI build log output. (Daniel Thayer)
+
+  * Remove unneeded lines from .travis.yml. (Daniel Thayer)
+
 2.5-501 | 2018-04-06 10:49:54 -0700
 
   * Fix NETBIOSSSN analyzer name (Vladimir Ruzanov)

VERSION

@@ -1 +1 @@
-2.5-501
+2.5-504

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
 }