From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 28 Feb 2024 11:10:17 +0000 (+0100)
Subject: share/containers/: trap(1) to see the cmocka logs
X-Git-Tag: 4.15.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d13844408ce138ce5903573ca51af517b1648350;p=thirdparty%2Fshadow.git

share/containers/: trap(1) to see the cmocka logs

Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/share/containers/alpine.dockerfile b/share/containers/alpine.dockerfile
index 8c48e865f..e1886e40c 100644
--- a/share/containers/alpine.dockerfile
+++ b/share/containers/alpine.dockerfile
@@ -5,6 +5,7 @@ FROM "${OS_IMAGE}" AS build
 RUN apk add \
 	autoconf \
 	automake \
+	bash \
 	build-base \
 	byacc \
 	cmocka-dev \
@@ -27,7 +28,7 @@ RUN ./autogen.sh \
 	--with-yescrypt
 RUN make -kj4 || true
 RUN make
-RUN make check
+RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
 FROM scratch AS export
diff --git a/share/containers/debian.dockerfile b/share/containers/debian.dockerfile
index 3dd05ac0d..9a3029672 100644
--- a/share/containers/debian.dockerfile
+++ b/share/containers/debian.dockerfile
@@ -25,7 +25,7 @@ RUN ./autogen.sh \
 	--with-yescrypt
 RUN make -kj4 || true
 RUN make
-RUN make check
+RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
 FROM scratch AS export
diff --git a/share/containers/fedora.dockerfile b/share/containers/fedora.dockerfile
index c701d9e7b..5ad9d418f 100644
--- a/share/containers/fedora.dockerfile
+++ b/share/containers/fedora.dockerfile
@@ -27,7 +27,7 @@ RUN ./autogen.sh \
 	--enable-logind=no
 RUN make -kj4 || true
 RUN make
-RUN make check
+RUN bash -c "trap 'cat <tests/unit/test-suite.log >&2' ERR; make check;"
 RUN make install
 
 FROM scratch AS export