From: Michal Privoznik <mprivozn@redhat.com>
Date: Sun, 16 May 2021 16:21:10 +0000 (+0200)
Subject: testutils: Drop libtool binary name handling
X-Git-Tag: v7.4.0-rc1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=351742e859de2b17b5412ead703f0d200849a96b;p=thirdparty%2Flibvirt.git

testutils: Drop libtool binary name handling

Back in the old days, we used to use libtool to run compiled
libraries. That meant we had to deal with "lt-" prefix for our
binaries. With meson that's no longer the case.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/tests/testutils.c b/tests/testutils.c
index d6b7c2a580..870a3b081a 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -750,8 +750,7 @@ int virTestMain(int argc,
     size_t noutputs = 0;
     virLogOutput *output = NULL;
     virLogOutput **outputs = NULL;
-    g_autofree char *baseprogname = NULL;
-    const char *progname;
+    g_autofree char *progname = NULL;
     g_autofree const char **preloads = NULL;
     size_t npreloads = 0;
     g_autofree char *mock = NULL;
@@ -784,9 +783,7 @@ int virTestMain(int argc,
         VIR_TEST_PRELOAD(mock);
     }
 
-    progname = baseprogname = g_path_get_basename(argv[0]);
-    if (STRPREFIX(progname, "lt-"))
-        progname += 3;
+    progname = g_path_get_basename(argv[0]);
 
     g_setenv("VIR_TEST_MOCK_PROGNAME", progname, TRUE);