Skip to content

Commit af574dc

Browse files
committed
rsyslog: fix valgrind suppression to be more generic
There is another test that is having the same valgrind error but with different function traceback. fwupd worflow: extend timeout to 20 minutes
1 parent a676729 commit af574dc

2 files changed

Lines changed: 52 additions & 10 deletions

File tree

.github/workflows/fwupd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
jobs:
1616
build_gnutls:
1717
name: Build wolfSSL, GnuTLS and provider
18-
timeout-minutes: 15
18+
timeout-minutes: 20
1919
strategy:
2020
matrix:
2121
os: [ ubuntu-latest ]

.github/workflows/rsyslog.yml

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,64 @@ jobs:
104104
pselect_cancel
105105
Memcheck:Param
106106
pselect6(sig)
107-
fun:__syscall_cancel_arch
108-
fun:__internal_syscall_cancel
109-
fun:__syscall_cancel
107+
...
110108
fun:pselect64_syscall
111109
fun:pselect
112-
fun:wait_timeout
113-
fun:mainloop
114-
fun:main
110+
...
111+
}
112+
{
113+
pselect_cancel_2
114+
Memcheck:Param
115+
pselect6(sig)
116+
fun:pselect64_syscall
117+
fun:pselect
118+
...
119+
}
120+
{
121+
init_leak_malloc
122+
Memcheck:Leak
123+
match-leak-kinds: definite
124+
fun:malloc
125+
obj:*
126+
obj:*
127+
obj:*
128+
obj:*
129+
obj:*
130+
fun:call_init.part.0
131+
fun:call_init
132+
fun:_dl_init
133+
fun:_dl_catch_exception
134+
fun:dl_open_worker
135+
fun:dl_open_worker
136+
fun:_dl_catch_exception
137+
fun:_dl_open
138+
}
139+
{
140+
init_leak_calloc
141+
Memcheck:Leak
142+
match-leak-kinds: definite
143+
fun:calloc
144+
obj:*
145+
obj:*
146+
obj:*
147+
obj:*
148+
obj:*
149+
obj:*
150+
obj:*
151+
fun:call_init.part.0
152+
fun:call_init
153+
fun:_dl_init
154+
fun:_dl_catch_exception
155+
fun:dl_open_worker
156+
fun:dl_open_worker
115157
}
116158
EOF
117-
export VALGRINDFLAGS=--suppressions=valgrind.supp
159+
export VALGRIND_OPTS=--suppressions=valgrind.supp
118160
export LD_LIBRARY_PATH=/opt/gnutls/lib:/opt/wolfssl/lib:/opt/wolfssl-gnutls-wrapper/lib
119161
make check 2>&1 | tee test.log
120162
awk '/^FAIL:/ {gsub(/\.sh$/, ".log", $2); print "==== " $2 " ===="; system("cat tests/" $2 "\n")}' test.log
121-
echo "Check for failures but exclude: rscript_http_request-vg.sh"
163+
echo "Check for failures"
122164
EC=0
123-
grep -v rscript_http_request-vg.sh test.log | grep '^FAIL:' && EC=1
165+
grep '^FAIL:' test.log && EC=1
124166
exit $EC
125167

0 commit comments

Comments
 (0)