diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job index e6274bfff1..d3e5cac9f5 100644 --- a/testing/scripts/travis-job +++ b/testing/scripts/travis-job @@ -167,8 +167,8 @@ build() { if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then ./configure --build-type=Release --disable-broker-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 + 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 fi } @@ -215,9 +215,9 @@ run() { set +e # Must specify a value for "-j" option, otherwise Travis uses a huge value. if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then - ../../aux/btest/btest -j 4 -d + ../../aux/btest/btest -j 4 -d else - ../../aux/btest/btest -j 4 -d -g leaks + ../../aux/btest/btest -j 4 -d -g leaks fi ret=$? @@ -257,35 +257,35 @@ run() { set +e if [ -d zeek-testing ]; then - cd zeek-testing - if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then - make - else - make leaks - fi + cd zeek-testing + if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then + make + else + make leaks + fi - if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then showdiag ret=1 - fi + fi - cd .. + cd .. fi if [ -d zeek-testing-private ]; then - cd zeek-testing-private - if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then - make - else - make leaks - fi + cd zeek-testing-private + if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then + make + else + make leaks + fi - if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then showdiag ret=1 - fi + fi - cd .. + cd .. fi cd ../..