fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 10:38:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: improve controlling whether to run run-nm-test.sh with valgrind

Browse source 
Use new environment variable NMTST_USE_VALGRIND. It works both
from `make check` and during explicit invocation of the test
runner.
This commit is contained in:
Thomas Haller 2016-11-01 16:46:40 +01:00
parent 58482a8fec
commit dbafd2ce50
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
tools/run-nm-test.sh
View file

@ -9,12 +9,25 @@ SCRIPT_PATH="${SCRIPT_PATH:-$(readlink -f "$(dirname "$0")")}"
VALGRIND_ERROR=37 VALGRIND_ERROR=37
if [[ -z "${NMTST_USE_VALGRIND+x}" ]]; then
if [[ -z "${NMTST_NO_VALGRIND+x}" ]]; then
NMTST_USE_VALGRIND=0
elif [[ -z "${NMTST_NO_VALGRIND}" ]]; then
NMTST_USE_VALGRIND=1
else
NMTST_USE_VALGRIND=0
fi
fi
[[ "${NMTST_USE_VALGRIND}" != 1 ]] && NMTST_USE_VALGRIND=0
if [ "$1" == "--called-from-make" ]; then if [ "$1" == "--called-from-make" ]; then
shift shift
NMTST_LIBTOOL=($1 --mode=execute); shift NMTST_LIBTOOL=($1 --mode=execute); shift
NMTST_VALGRIND="$1"; shift NMTST_VALGRIND="$1"; shift
NMTST_CHANGE_DIRECTORY= NMTST_CHANGE_DIRECTORY=
if [[ "$NMTST_VALGRIND" == no ]]; then if [[ "$NMTST_VALGRIND" == no ]]; then
NMTST_USE_VALGRIND=0
NMTST_VALGRIND= NMTST_VALGRIND=
fi fi
SUPPRESSIONS="$1"; shift SUPPRESSIONS="$1"; shift
@ -51,14 +64,12 @@ else
NMTST_LIBTOOL=() NMTST_LIBTOOL=()
shift shift
;; ;;
"--valgrind") "--valgrind"|-v)
NMTST_NO_VALGRIND= NMTST_USE_VALGRIND=1
NMTST_VALGRIND=valgrind
shift; shift;
;; ;;
"--no-valgrind") "--no-valgrind"|-V)
NMTST_NO_VALGRIND=no NMTST_USE_VALGRIND=0
NMTST_VALGRIND=""
shift; shift;
;; ;;
"--") "--")
@ -73,7 +84,6 @@ else
# we support calling the script directly. In this case, # we support calling the script directly. In this case,
# only pass the path to the test to run. # only pass the path to the test to run.
TEST="$1"; shift TEST="$1"; shift
NMTST_VALGRIND="${NMTST_VALGRIND:-valgrind}"
if [ "$SUPPRESSIONS" == "" ]; then if [ "$SUPPRESSIONS" == "" ]; then
SUPPRESSIONS="$SCRIPT_PATH/../valgrind.suppressions" SUPPRESSIONS="$SCRIPT_PATH/../valgrind.suppressions"
fi fi
@ -112,12 +122,15 @@ fi
[ -x "$TEST" ] || die "Cannot execute test \"$TEST\"" [ -x "$TEST" ] || die "Cannot execute test \"$TEST\""
if [ "$NMTST_NO_VALGRIND" != "" -o "$NMTST_VALGRIND" == "" ]; then if [ "$NMTST_USE_VALGRIND" != "1" ]; then
"${NMTST_DBUS_RUN_SESSION[@]}" \ "${NMTST_DBUS_RUN_SESSION[@]}" \
"$TEST" "$@" "$TEST" "$@"
exit $? exit $?
fi fi
if [[ -z "${NMTST_VALGRIND}" ]]; then
NMTST_VALGRIND=`which valgrind` || die "cannot find valgrind binary. Set \$NMTST_VALGRIND"
fi
LOGFILE="${TEST}.valgrind-log" LOGFILE="${TEST}.valgrind-log"