From 20cc1385dd6f6094d99d9f7daecf56fbc20ced40 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 13 Aug 2020 11:27:55 +0200
Subject: [PATCH] tests: fix handling of $NMTST_LIBTOOL in
 "tools/run-nm-test.sh" script

(cherry picked from commit 0bd816002955816be01684bdaa8cc3682992f21d)
---
 tools/run-nm-test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 11c9e17a0b..4df3ab962f 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -96,12 +96,12 @@ else
         NMTST_USE_VALGRIND=0
     fi
 
-    if [ -n "${NMTST_LIBTOOL-:x}" ]; then
-        NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" --mode=execute)
-    elif [ -n "${NMTST_LIBTOOL-x}" ]; then
+    if [ -z "${NMTST_LIBTOOL+x}" ]; then
+        NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" "--mode=execute")
+    elif [ -z "$NMTST_LIBTOOL" ]; then
         NMTST_LIBTOOL=()
     else
-        NMTST_LIBTOOL=($NMTST_LIBTOOL --mode=execute)
+        NMTST_LIBTOOL=("$NMTST_LIBTOOL" "--mode=execute")
     fi
     unset TEST
     while test $# -gt 0; do