Commit 6d6700d2 by Edward Thomson

ci: valgrind leak-checking

parent 67f5304f
...@@ -26,6 +26,7 @@ phases: ...@@ -26,6 +26,7 @@ phases:
volumes: | volumes: |
$(Build.SourcesDirectory):/src $(Build.SourcesDirectory):/src
$(Build.BinariesDirectory):/build $(Build.BinariesDirectory):/build
envVars: 'LEAK_CHECK=valgrind'
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/test.sh' containerCommand: '/src/ci/test.sh'
detached: false detached: false
...@@ -55,6 +56,7 @@ phases: ...@@ -55,6 +56,7 @@ phases:
volumes: | volumes: |
$(Build.SourcesDirectory):/src $(Build.SourcesDirectory):/src
$(Build.BinariesDirectory):/build $(Build.BinariesDirectory):/build
envVars: 'LEAK_CHECK=valgrind'
workDir: '/build' workDir: '/build'
containerCommand: '/src/ci/test.sh' containerCommand: '/src/ci/test.sh'
detached: false detached: false
......
...@@ -6,6 +6,13 @@ if [ -n "$SKIP_TESTS" ]; then ...@@ -6,6 +6,13 @@ if [ -n "$SKIP_TESTS" ]; then
exit 0 exit 0
fi fi
SOURCE_DIR=${SOURCE_DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && dirname $( pwd ) )}
BUILD_DIR=$(pwd)
TMPDIR=${TMPDIR:-/tmp}
USER=${USER:-$(whoami)}
VALGRIND="valgrind --leak-check=full --show-reachable=yes --error-exitcode=125 --num-callers=50 --suppressions=\"$SOURCE_DIR/libgit2_clar.supp\""
cleanup() { cleanup() {
echo "Cleaning up..." echo "Cleaning up..."
...@@ -23,8 +30,20 @@ die() { ...@@ -23,8 +30,20 @@ die() {
exit $1 exit $1
} }
TMPDIR=${TMPDIR:-/tmp} # Ask ctest what it would run if we were to invoke it directly. This lets us manage the
USER=${USER:-$(whoami)} # test configuration in a single place (tests/CMakeLists.txt) instead of running clar
# here as well. But it allows us to wrap our test harness with a leak checker like valgrind.
run_test() {
TEST_CMD=$(ctest -N -V -R $1 | sed -n 's/^[0-9]*: Test command: //p')
if [ "$LEAK_CHECK" = "valgrind" ]; then
RUNNER="$VALGRIND $TEST_CMD"
else
RUNNER="$TEST_CMD"
fi
eval $RUNNER || die $?
}
# Configure the test environment; run them early so that we're certain # Configure the test environment; run them early so that we're certain
# that they're started by the time we need them. # that they're started by the time we need them.
...@@ -96,7 +115,7 @@ if [ -z "$SKIP_OFFLINE_TESTS" ]; then ...@@ -96,7 +115,7 @@ if [ -z "$SKIP_OFFLINE_TESTS" ]; then
echo "## Running (offline) tests" echo "## Running (offline) tests"
echo "##############################################################################" echo "##############################################################################"
ctest -V -R offline || die $? run_test offline
fi fi
if [ -z "$SKIP_ONLINE_TESTS" ]; then if [ -z "$SKIP_ONLINE_TESTS" ]; then
...@@ -109,7 +128,7 @@ if [ -z "$SKIP_ONLINE_TESTS" ]; then ...@@ -109,7 +128,7 @@ if [ -z "$SKIP_ONLINE_TESTS" ]; then
echo "## Running (online) tests" echo "## Running (online) tests"
echo "##############################################################################" echo "##############################################################################"
ctest -V -R online || die $? run_test online
fi fi
if [ -z "$SKIP_GITDAEMON_TESTS" ]; then if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
...@@ -118,7 +137,7 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then ...@@ -118,7 +137,7 @@ if [ -z "$SKIP_GITDAEMON_TESTS" ]; then
echo "" echo ""
export GITTEST_REMOTE_URL="git://localhost/test.git" export GITTEST_REMOTE_URL="git://localhost/test.git"
ctest -V -R gitdaemon || die $? run_test gitdaemon
unset GITTEST_REMOTE_URL unset GITTEST_REMOTE_URL
fi fi
...@@ -130,7 +149,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then ...@@ -130,7 +149,7 @@ if [ -z "$SKIP_PROXY_TESTS" ]; then
export GITTEST_REMOTE_PROXY_URL="localhost:8080" export GITTEST_REMOTE_PROXY_URL="localhost:8080"
export GITTEST_REMOTE_PROXY_USER="foo" export GITTEST_REMOTE_PROXY_USER="foo"
export GITTEST_REMOTE_PROXY_PASS="bar" export GITTEST_REMOTE_PROXY_PASS="bar"
ctest -V -R proxy || die $? run_test proxy
unset GITTEST_REMOTE_PROXY_URL unset GITTEST_REMOTE_PROXY_URL
unset GITTEST_REMOTE_PROXY_USER unset GITTEST_REMOTE_PROXY_USER
unset GITTEST_REMOTE_PROXY_PASS unset GITTEST_REMOTE_PROXY_PASS
...@@ -147,7 +166,7 @@ if [ -z "$SKIP_SSH_TESTS" ]; then ...@@ -147,7 +166,7 @@ if [ -z "$SKIP_SSH_TESTS" ]; then
export GITTEST_REMOTE_SSH_PUBKEY="${HOME}/.ssh/id_rsa.pub" export GITTEST_REMOTE_SSH_PUBKEY="${HOME}/.ssh/id_rsa.pub"
export GITTEST_REMOTE_SSH_PASSPHRASE="" export GITTEST_REMOTE_SSH_PASSPHRASE=""
export GITTEST_REMOTE_SSH_FINGERPRINT="${SSH_FINGERPRINT}" export GITTEST_REMOTE_SSH_FINGERPRINT="${SSH_FINGERPRINT}"
ctest -V -R ssh || die $? run_test ssh
unset GITTEST_REMOTE_URL unset GITTEST_REMOTE_URL
unset GITTEST_REMOTE_USER unset GITTEST_REMOTE_USER
unset GITTEST_REMOTE_SSH_KEY unset GITTEST_REMOTE_SSH_KEY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment