From 602ba64d5e0be0e4f14c58f17c932c0a8a8a4f3c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 18 Apr 2021 12:20:43 +0100 Subject: [PATCH] Add proposed patch to make test failures easier to debug --- ...re-make-it-clearer-what-has-happened.patch | 33 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/libtest-On-failure-make-it-clearer-what-has-happened.patch diff --git a/debian/patches/libtest-On-failure-make-it-clearer-what-has-happened.patch b/debian/patches/libtest-On-failure-make-it-clearer-what-has-happened.patch new file mode 100644 index 00000000..f7ca5927 --- /dev/null +++ b/debian/patches/libtest-On-failure-make-it-clearer-what-has-happened.patch @@ -0,0 +1,33 @@ +From: Simon McVittie +Date: Sun, 18 Apr 2021 12:16:45 +0100 +Subject: libtest: On failure, make it clearer what has happened + +If we fail as a result of `set -x`, It's often not completely obvious +which command failed or how. Use a trap on ERR to show the command that +failed, and its exit status. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/2350 +--- + tests/libtest.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index eda3b92..2e9a99d 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -46,6 +46,14 @@ 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" diff --git a/debian/patches/series b/debian/patches/series index b73e566a..e0991715 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +libtest-On-failure-make-it-clearer-what-has-happened.patch debian/Skip-test-pull-repeated-during-CI.patch