summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-04-11 10:49:33 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-04-12 09:21:10 +0200
commita2479b95c0d44d3d5cea77ce1703407b4be6fb92 (patch)
treeb9d38c9c7649b016bd5262c64ba3834b1abffd42 /tools
parent3b5a522ef6e212772590ad8a569864ba82b91c9f (diff)
downloadNetworkManager-a2479b95c0d44d3d5cea77ce1703407b4be6fb92.tar.gz
build: meson: use run-nm-test.sh to run tests
Like autotools, use the wrapper script 'run-nm-test.sh' that starts a separate D-Bus session when needed.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run-nm-test.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 2c23e7175f..7f3053ce17 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -35,7 +35,12 @@ else
fi
if [ "$CALLED_FROM_MAKE" == 1 ]; then
- NMTST_LIBTOOL=($1 --mode=execute); shift
+ if [ -n "$1" ]; then
+ NMTST_LIBTOOL=($1 --mode=execute);
+ else
+ NMTST_LIBTOOL=()
+ fi
+ shift
NMTST_VALGRIND_ARG="$1"; shift
if [[ "$NMTST_VALGRIND_ARG" == no ]]; then
NMTST_VALGRIND_ARG=