diff --git a/CHANGES b/CHANGES index f119f32b3d..e045d46415 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.6-beta2-60 | 2018-11-01 18:35:26 -0500 + + * Add core file search and stack trace output for Travis builds (Jon Siwek, Corelight) + + * Update license year for 2018 (Vlad Grigorescu) + 2.6-beta2-57 | 2018-10-31 22:26:24 -0500 * GH-199: change `bro --help` exit status from 1 to 0 (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index c8ab95122a..7504a60de9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-beta2-57 +2.6-beta2-60 diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job index 12b23262fd..79c06c53c8 100644 --- a/testing/scripts/travis-job +++ b/testing/scripts/travis-job @@ -80,19 +80,19 @@ run_coverity() { install_in_docker() { case $distro in centos_7) - distro_cmds="yum -y install cmake make gcc gcc-c++ flex bison libpcap-devel openssl-devel git openssl which" + distro_cmds="yum -y install gdb cmake make gcc gcc-c++ flex bison libpcap-devel openssl-devel git openssl which" ;; debian_9) - distro_cmds="apt-get update; apt-get -y install cmake make gcc g++ flex bison python libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils" + distro_cmds="apt-get update; apt-get -y install gdb cmake make gcc g++ flex bison python libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils" ;; fedora_28) - distro_cmds="yum -y install cmake make gcc gcc-c++ flex bison libpcap-devel openssl-devel git sqlite findutils which; ln -s /usr/bin/python3 /usr/local/bin/python" + distro_cmds="yum -y install gdb cmake make gcc gcc-c++ flex bison libpcap-devel openssl-devel git sqlite findutils which; ln -s /usr/bin/python3 /usr/local/bin/python" ;; ubuntu_16.04) - distro_cmds="apt-get update; apt-get -y install cmake make gcc g++ flex bison python libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils" + distro_cmds="apt-get update; apt-get -y install gdb cmake make gcc g++ flex bison python libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils" ;; ubuntu_18.04) - distro_cmds="apt-get update; apt-get -y install cmake make gcc g++ flex bison python3 libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils; ln -s /usr/bin/python3 /usr/local/bin/python" + distro_cmds="apt-get update; apt-get -y install gdb cmake make gcc g++ flex bison python3 libpcap-dev libssl-dev zlib1g-dev libkrb5-dev git sqlite3 curl bsdmainutils; ln -s /usr/bin/python3 /usr/local/bin/python" ;; *) echo "Error: distro ${distro} is not recognized by this script" @@ -178,6 +178,7 @@ get_private_tests() { # Run Bro tests. run() { + ulimit -c unlimited echo echo "Running unit tests ##################################################" echo @@ -219,7 +220,22 @@ run() { echo echo "Running external tests ##############################################" echo - make || showdiag + make + + if [ $? -ne 0 ]; then + showdiag + ret=1 + fi + + cd ../.. + + if [ $ret -ne 0 ]; then + COREFILE=`find testing/btest/.tmp testing/external/*/.tmp -name "core*" | head -n 1` + + if [ -f "$COREFILE" ]; then + gdb build/src/bro -c "$COREFILE" -ex "thread apply all bt" -ex "set pagination 0" -batch; + fi + fi # If we get here, then external tests were successful. exit $ret @@ -234,8 +250,6 @@ showdiag() { echo "Output of failed external tests #####################################" && \ echo && \ grep -v "... not available, skipped" $f - - exit 1 } # Remove the docker container.