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