summary refs log tree commit diff
path: root/tools/run-nm-test.sh
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-01-25 09:46:18 +0100
committerMichael Biebl <biebl@debian.org>2024-01-25 09:46:18 +0100
commit70e18d99b8e3e77bb37e218d7ac582130156f8ef (patch)
treed40c587e6d3f0e094ff558e415f1bb9803643214 /tools/run-nm-test.sh
parentd4d8b2b91f7ba000d97a8b2aab48c85000c11314 (diff)
New upstream version 1.45.90 upstream/1.45.90
Diffstat (limited to 'tools/run-nm-test.sh')
-rwxr-xr-xtools/run-nm-test.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index c88a1bd5..264fc48d 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -135,12 +135,12 @@ else
         NMTST_USE_VALGRIND=0
     fi
 
-    if [ -z "${NMTST_LIBTOOL+x}" ]; then
+    if [ -n "$NMTST_LIBTOOL" ] ; then
+        NMTST_LIBTOOL=("$NMTST_LIBTOOL" "--mode=execute")
+    elif [ -z "${NMTST_LIBTOOL+x}" -a -f "$SCRIPT_PATH/../libtool" ]; 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=()
     fi
     TEST_ARGV=()
     unset TEST