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 8c48e865f9b96573b1234cc6bcc2fcbefd1cc62a..e1886e40c6864a42e9bc528459c1eecb809d107b 100644 (file)
--- 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 3dd05ac0dc39a7dd0c2a38f091dc68debcebd473..9a30296728fd0d4514b583befb2649b28f693f34 100644 (file)
--- 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 c701d9e7ba4436858c925ee3a8290857b87982c8..5ad9d418f6330e02f6e0ed0414dd887929e6f89f 100644 (file)
--- 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