From: Martin Matuska <martin@matuska.org>
Date: Mon, 3 Jan 2022 09:23:27 +0000 (+0100)
Subject: CI: fix ubuntu distcheck
X-Git-Tag: v3.6.0~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34462ad61f9c5aa1d2b22ea9b74b508bb8b1441e;p=thirdparty%2Flibarchive.git

CI: fix ubuntu distcheck

Add missing test_read_format_rar5_sfx.exe.uu
Be more verbose on failure
---

diff --git a/Makefile.am b/Makefile.am
index e43531c1e..cc8ae29c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -881,6 +881,7 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_rar5_nonempty_dir_stream.rar.uu \
 	libarchive/test/test_read_format_rar5_owner.rar.uu \
 	libarchive/test/test_read_format_rar5_readtables_overflow.rar.uu \
+	libarchive/test/test_read_format_rar5_sfx.exe.uu \
 	libarchive/test/test_read_format_rar5_solid.rar.uu \
 	libarchive/test/test_read_format_rar5_stored.rar.uu \
 	libarchive/test/test_read_format_rar5_stored_manyfiles.rar.uu \
diff --git a/build/ci/build.sh b/build/ci/build.sh
index 0e0c2fbab..6e36e3e75 100755
--- a/build/ci/build.sh
+++ b/build/ci/build.sh
@@ -151,7 +151,12 @@ for action in ${ACTIONS}; do
 			cd "${BUILDDIR}/destdir" && ls -lR .
 		;;
 		distcheck)
-			${MAKE} ${MAKE_ARGS} distcheck
+			${MAKE} ${MAKE_ARGS} distcheck || (
+				RET="$?"
+				find . -name 'test-suite.log' -print -exec cat {} \;
+				find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \;
+				exit "${RET}"
+			)
 			RET="$?"
 		;;
 		artifact)