Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix indents/whitespace in Travis CI script

Browse source
This commit is contained in:
Jon Siwek 2019-11-15 09:46:18 -08:00
parent 17fd371eae
commit 9e83abc5d9
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
testing/scripts/travis-job
View file

@ -167,8 +167,8 @@ build() {
if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
./configure --build-type=Release --disable-broker-tests --disable-python --disable-zeekctl && make -j 2 ./configure --build-type=Release --disable-broker-tests --disable-python --disable-zeekctl && make -j 2
else else
echo "Configuring zeek to build for leak testing" 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 ./configure --build-type=Debug --disable-broker-tests --disable-python --disable-zeekctl --enable-perftools --enable-perftools-debug && make -j 2
fi fi
} }
@ -215,9 +215,9 @@ run() {
set +e set +e
# Must specify a value for "-j" option, otherwise Travis uses a huge value. # Must specify a value for "-j" option, otherwise Travis uses a huge value.
if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
../../aux/btest/btest -j 4 -d ../../aux/btest/btest -j 4 -d
else else
../../aux/btest/btest -j 4 -d -g leaks ../../aux/btest/btest -j 4 -d -g leaks
fi fi
ret=$? ret=$?
@ -257,35 +257,35 @@ run() {
set +e set +e
if [ -d zeek-testing ]; then if [ -d zeek-testing ]; then
cd zeek-testing cd zeek-testing
if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
make make
else else
make leaks make leaks
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
showdiag showdiag
ret=1 ret=1
fi fi
cd .. cd ..
fi fi
if [ -d zeek-testing-private ]; then if [ -d zeek-testing-private ]; then
cd zeek-testing-private cd zeek-testing-private
if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then if [ "${BUILD_DISTRO}" != "${LEAK_TEST_DISTRO}" ]; then
make make
else else
make leaks make leaks
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
showdiag showdiag
ret=1 ret=1
fi fi
cd .. cd ..
fi fi
cd ../.. cd ../..