Update upstream source from tag 'upstream/1.56.0'

Update to upstream version '1.56.0'
with Debian dir 15fab61a7abf1fd4e2ba46785f96d935e87d32bb

1 files changed, 2 insertions, 10 deletions

diff --git a/src/tests/client/test-client.sh b/src/tests/client/test-client.sh
index dd08e4d8..ac07dd20 100755
--- a/src/tests/client/test-client.sh
+++ b/src/tests/client/test-client.sh
@@ -72,12 +72,10 @@ fi
 test -d "$BUILDDIR" || die "BUILDDIR \"$BUILDDIR\" does not exist?"
 test -d "$SRCDIR" || die "SRCDIR \"$SRCDIR\" does not exist?"
 
-if test -f "$BUILDDIR/src/libnm-client-impl/.libs/libnm.so" ; then
-    LIBDIR="$BUILDDIR/src/libnm-client-impl/.libs"
-elif test -f "$BUILDDIR/src/libnm-client-impl/libnm.so" ; then
+if test -f "$BUILDDIR/src/libnm-client-impl/libnm.so" ; then
     LIBDIR="$BUILDDIR/src/libnm-client-impl"
 else
-    die "libnm.so does not exist under expected paths in \"$BUILDDIR/src/libnm-client-impl/{.,.libs}/\""
+    die "libnm.so does not exist under expected paths in \"$BUILDDIR/src/libnm-client-impl/\""
 fi
 
 mkdir -p "$BUILDDIR/src/tests/client/" || die "failure to create build output directory \"$BUILDDIR/src/tests/client/\""
@@ -88,12 +86,6 @@ export GI_TYPELIB_PATH="$BUILDDIR/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_T
 export LD_LIBRARY_PATH="$LIBDIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 export NM_TEST_CLIENT_BUILDDIR="$BUILDDIR"
 
-# Run nmcli at least once. With libtool, nmcli is a shell script and with LTO
-# this seems to perform some slow setup during the first run. If we do that
-# during the test, it will timeout and fail.
-"$NM_TEST_CLIENT_NMCLI_PATH" --version &>/dev/null || :
-"$NM_TEST_CLIENT_CLOUD_SETUP_PATH" --invalid &>/dev/null || :
-
 # we first collect all the output in "test-client.log" and print it at once
 # afterwards. The only reason is that when you run with `make -j` that the
 # test output is grouped together.