travis ci: enable gcc, call build.sh && test.sh

gcc is default compiler on most distributions, we should
also test with it.

build.sh exists and should be tested as well, so why not use
it in Travis.
test.sh outputs much more details than "make check", so
run it as well.

Additionally, make build.sh and test.sh work when called from
other directories.
This commit is contained in:
Jakob Unterwurzacher 2017-07-29 21:07:08 +02:00 committed by rfjakob
parent 6ed2001c2e
commit 8a2c03d8a9
3 changed files with 16 additions and 13 deletions

View File

@ -6,6 +6,7 @@ sudo: true
compiler: compiler:
- clang - clang
- gcc
branches: branches:
only: only:
@ -21,14 +22,10 @@ env:
before_script: before_script:
- sudo modprobe fuse - sudo modprobe fuse
- mkdir build
- cd build
- cmake --version - cmake --version
- cmake ..
script: script:
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make && make check ; fi - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./build.sh && ./test.sh && make check -C build ; fi
addons: addons:
coverity_scan: coverity_scan:

View File

@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash -eu
set -eu # Make sure we are in the directory this script is in.
cd "$(dirname "$0")"
if [ ! -d build ] if [[ ! -d build ]]
then then
mkdir build mkdir build
cd build cd build
cmake .. cmake ..
else cd ..
cd build
fi fi
make make -j2 -C build

10
test.sh
View File

@ -1,10 +1,16 @@
#!/bin/bash -eu #!/bin/bash -eu
./build/checkops &> /dev/null # Make sure we are in the directory this script is in.
cd "$(dirname "$0")"
# Failed tests can leave dangling mounts behind.
for i in $(mount | grep -e "/tmp/encfs-reverse-tests-\|/tmp/encfs-tests-" | cut -f3 -d" "); do for i in $(mount | grep -e "/tmp/encfs-reverse-tests-\|/tmp/encfs-tests-" | cut -f3 -d" "); do
echo "Warning: unmounting leftover filesystem: $i" echo "Warning: unmounting leftover filesystem: $i"
fusermount -u $i fusermount -u $i || true
done done
# This is very noisy so run it silently at first. Run it again with
# output if the first run fails.
./build/checkops &> /dev/null || ./build/checkops
perl -MTest::Harness -e '$$Test::Harness::debug=1; runtests @ARGV;' tests/*.t.pl perl -MTest::Harness -e '$$Test::Harness::debug=1; runtests @ARGV;' tests/*.t.pl