gplugin/builders

Update the valgrind image to work properly

2020-02-25, Gary Kramlich
83e46abdc0ef
Parents 100e8475fa6d
Children bc37aa0a5687
Update the valgrind image to work properly
2 files changed, 12 insertions(+), 4 deletions(-)
  • +3 -2
    Dockerfile.valgrind
  • +9 -2
    valgrind/build.sh
    • --- a/Dockerfile.valgrind Tue Feb 25 00:44:20 2020 -0600
    +++ b/Dockerfile.valgrind Tue Feb 25 00:45:06 2020 -0600
    @@ -3,12 +3,13 @@
    MAINTAINER Gary Kramlich <grim@reaperworld.com>
    RUN set -ex && \
    - echo deb http://debug.mirrors.debian.org/debian-debug/ buster-debug main > /etc/apt/sources.list.d/dbgsym.list && \
    + echo deb http://debug.mirrors.debian.org/debian-debug/ bullseye-debug main > /etc/apt/sources.list.d/dbgsym.list && \
    apt-get update && \
    apt-get install -y --no-install-recommends \
    valgrind \
    libglib2.0-0-dbgsym libgtk-3-0-dbgsym \
    - liblua5.1-0-dbg libpython3-dbg libgirepository-1.0-1-dbgsym \
    + liblua5.3-0-dbg libpython3-dbg libgirepository-1.0-1-dbgsym \
    + libglib-perl-dbgsym libglib-object-introspection-perl-dbgsym \
    && \
    apt-get clean && \
    rm -rf /var/lib/apt/lists
    --- a/valgrind/build.sh Tue Feb 25 00:44:20 2020 -0600
    +++ b/valgrind/build.sh Tue Feb 25 00:45:06 2020 -0600
    @@ -19,13 +19,20 @@
    BUILD_DIR="build-valgrind"
    +VALGRIND_COMMAND=<<EOF
    +valgrind
    + --suppressions=/usr/share/glib-2.0/valgrind/glib.supp
    + --leak-check=full
    + --error-exitcode=1
    + $@
    +EOF
    meson ${BUILD_DIR}
    -meson test -C ${BUILD_DIR} --wrapper "valgrind --leak-check=full --error-exitcode=1"
    +meson test -C ${BUILD_DIR} --wrapper "${VARGRIND_COMMAND}"
    EC=${?}
    mkdir -p ${CONVEY_WORKSPACE}/valgrind
    -cp -a ${BUILD_DIR}/meson-logs/testlog-valgrind.txt ${CONVEY_WORKSPACE}/valgrind/
    +cp -a ${BUILD_DIR}/meson-logs/testlog.txt ${CONVEY_WORKSPACE}/valgrind/
    exit ${EC}