From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 9 Aug 2024 12:21:23 +0000 (+0200)
Subject: testQemuConfXMLCommon: Strip 'abs_srcdir' paths from '.err' files in qemuxmlconftest
X-Git-Tag: v10.7.0-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc889a62611efd902feaea08c552cf81dcf235c;p=thirdparty%2Flibvirt.git

testQemuConfXMLCommon: Strip 'abs_srcdir' paths from '.err' files in qemuxmlconftest

Upcoming patch will result in having the build directory path in some of
the output files. Replace it by a constant 'ABS_SRCDIR' to avoild
breaking tests.

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

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 2e8b786983..6e882ca0a8 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -687,8 +687,12 @@ testQemuConfXMLCommon(testQemuInfo *info,
         }
 
         if (info->flags & FLAG_EXPECT_PARSE_ERROR) {
-            g_autofree char *tmperr = g_strdup_printf("%s\n", NULLSTR(err->message));
-            if (virTestCompareToFile(tmperr, info->errfile) >= 0) {
+            g_autoptr(GString) errstr = g_string_new(NULLSTR(err->message));
+
+            g_string_replace(errstr, abs_srcdir, "ABS_SRCDIR", 0);
+            g_string_append_c(errstr, '\n');
+
+            if (virTestCompareToFile(errstr->str, info->errfile) >= 0) {
                 info->prep_skip = true;
             }
         }