From: Simon McVittie <smcv@collabora.com>
Date: Tue, 22 Jun 2021 09:37:39 +0000 (+0100)
Subject: libtest.sh: Remove duplicate ERR trap and report_err()
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~3^2~6^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3cc4f8710f377c2f61d05c818c4bcc372e532c89;p=ostree.git

libtest.sh: Remove duplicate ERR trap and report_err()

Since #2377 was merged, this is in libtest-core.sh, which is sourced by
libtest.sh.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/tests/libtest.sh b/tests/libtest.sh
index bf34cd5e..260b8d1d 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -46,14 +46,6 @@ run_exit_cmds() {
 }
 trap run_exit_cmds EXIT
 
-report_err () {
-  local exit_status="$?"
-  { { local BASH_XTRACEFD=3; } 2> /dev/null
-  echo "Unexpected nonzero exit status $exit_status while running: $BASH_COMMAND" >&2
-  } 3> /dev/null
-}
-trap report_err ERR
-
 save_core() {
   if [ -e core ]; then
     cp core "$test_srcdir/core"