From 802b4f876eb7375d543b3b46f59b2d2322a0ab50 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 2 Nov 2018 09:36:30 -0500
Subject: [PATCH] Improve Travis script to show multiple core dump stacks

---
 CHANGES                    |  4 ++++
 VERSION                    |  2 +-
 testing/scripts/travis-job | 18 +++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4ba59d8191..b2dcc13f2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-beta2-65 | 2018-11-02 09:36:30 -0500
+
+  * Improve Travis script to show multiple core dump stacks (Jon Siwek, Corelight)
+
 2.6-beta2-64 | 2018-11-02 08:56:59 -0500
 
   * Improve a weird stats unit test (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index 441d9a067e..7ef7d0da78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta2-64
+2.6-beta2-65
diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index 15cbb41482..656ff7bb11 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -254,20 +254,20 @@ run() {
     echo "Result code after running tests: $ret"
 
     if [ $ret -ne 0 ]; then
-        COREDUMP_FIND=`find testing/btest/.tmp testing/external/*/.tmp -name core*`
-        COREFILE=`find testing/btest/.tmp testing/external/*/.tmp -name core* | head -n 1`
+        COREFILES=`find testing/btest/.tmp testing/external/*/.tmp -type f -name core*`
 
         echo
         echo "Search for core dumps ##############################################"
         echo
-        echo `pwd`
-        echo
-        echo $COREDUMP_FIND
+        echo $COREFILES
 
-        if [ -f "$COREFILE" ]; then
-            echo "Getting stack trace from $COREFILE"
-            gdb build/src/bro -c "$COREFILE" -ex "thread apply all bt" -ex "set pagination 0" -batch;
-        fi
+        for cf in $COREFILES; do
+            echo
+            echo "############# Begin stack trace for $cf ###############"
+            gdb build/src/bro -c "$cf" -ex "thread apply all bt" -ex "set pagination 0" -batch;
+            echo "############# End stack trace for $cf #################"
+            echo
+        done
     fi
 
     # If we get here, then external tests were successful.