From: Colin Walters <walters@verbum.org>
Date: Mon, 2 Jun 2025 21:04:34 +0000 (-0400)
Subject: libtest: Quiet some output
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~4^2~22^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=de5239f60b6503415713de53b4c6950f6bc6869c;p=ostree.git

libtest: Quiet some output

Otherwise there's a lot of test spam.

Signed-off-by: Colin Walters <walters@verbum.org>
---

diff --git a/tests/libtest.sh b/tests/libtest.sh
index f8a7dc74..e1eb1377 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -42,6 +42,8 @@ PATH="$PATH:/usr/sbin:/sbin"
 # libtest_exit_cmds+=(expr).
 libtest_exit_cmds=()
 run_exit_cmds() {
+  # Quiet termination
+  set +x
   for expr in "${libtest_exit_cmds[@]}"; do
     eval "${expr}" || true
   done
@@ -747,8 +749,9 @@ which_gpg () {
 }
 
 libtest_cleanup_gpg () {
+    set +x
     local gpg_homedir=${1:-${test_tmpdir}/gpghome}
-    gpg-connect-agent --homedir "${gpg_homedir}" killagent /bye || true
+    gpg-connect-agent --homedir "${gpg_homedir}" killagent /bye &>/dev/null || true
 }
 libtest_exit_cmds+=(libtest_cleanup_gpg)