From a9e05358d0070d4326be0df882f4d480822f4f06 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Fri, 5 Feb 2021 14:50:03 -0500 Subject: [PATCH 08/22] test(functions): format xml output with xmllint (cherry picked from commit 53684e4b3b458b91fe7a71e7c3f8aa3363e5d108) (cherry picked from commit c509b9a4c0749087e462bbb62a9808a43a74b3d9) --- src/tests/functions.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/functions.at b/src/tests/functions.at index 631beee6e2d8..8632f49e442f 100644 --- a/src/tests/functions.at +++ b/src/tests/functions.at @@ -471,7 +471,7 @@ m4_define([DBUS_INTROSPECT], [ NS_CHECK([PIPESTATUS0([gdbus introspect --xml --system --dest=org.fedoraproject.FirewallD1 dnl m4_ifblank([$1], [--object-path /org/fedoraproject/FirewallD1], [--object-path /org/fedoraproject/FirewallD1/$1])], dnl - [m4_ifnblank([$2], [xmllint --xpath '$2' - |]) xmllint --c14n - | TRIM_WHITESPACE])], + [m4_ifnblank([$2], [xmllint --xpath '$2' - |]) xmllint --format - | xmllint --c14n - | TRIM_WHITESPACE])], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7]) ]) -- 2.27.0