Skip to content

Commit 64808a9

Browse files
committed
ci: fixes for fedora
Use fedora's valgrind instead of trying to build our own; omit false positive leaks in getaddrinfo;
1 parent 98c4955 commit 64808a9

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

ci/docker/fedora

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ RUN yum install -y \
1818
java-1.8.0-openjdk-headless \
1919
sudo \
2020
python3 \
21+
valgrind \
2122
krb5-workstation \
2223
krb5-libs \
23-
krb5-devel \
24-
pcre2-devel \
24+
krb5-devel \
25+
pcre2-devel \
26+
zlib-devel \
2527
ninja-build \
2628
llhttp-devel
2729

@@ -35,18 +37,7 @@ RUN cd /tmp && \
3537
cd .. && \
3638
rm -rf libssh2-1.11.0
3739

38-
FROM libssh2 AS valgrind
39-
RUN cd /tmp && \
40-
curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.15.0.tar.bz2 | \
41-
tar -xj && \
42-
cd valgrind-3.15.0 && \
43-
./configure && \
44-
make MAKEFLAGS="-j -l$(grep -c ^processor /proc/cpuinfo)" && \
45-
make install && \
46-
cd .. && \
47-
rm -rf valgrind-3.15.0
48-
49-
FROM valgrind AS adduser
40+
FROM libssh2 AS adduser
5041
ARG UID=""
5142
ARG GID=""
5243
RUN if [ "${UID}" != "" ]; then USER_ARG="--uid ${UID}"; fi && \

script/valgrind.supp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
fun:__check_pf
8181
}
8282

83+
{
84+
ignore-glibc-getaddrinfo-fn
85+
Memcheck:Leak
86+
...
87+
fun:getaddrinfo
88+
}
89+
8390
{
8491
ignore-curl-global-init
8592
Memcheck:Leak

0 commit comments

Comments
 (0)