fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 12:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab-ci: disable valgrind on Fedora 30 and Fedora 31 depending on glib2 package

Browse source 
Valgrind is known to report many false positives with certain glib2
versions. Workaround that by disabling it based on the installed
package version.

See-also: https://bugzilla.redhat.com/show_bug.cgi?id=1710417
See-also: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/155
(cherry picked from commit 5e11d4bf1f)
This commit is contained in:
Thomas Haller 2019-05-18 11:19:45 +02:00
parent cdfee89c4c
commit 87c0e8dc83
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
contrib/scripts/nm-ci-run.sh
View file

@ -90,6 +90,32 @@ if [ "$WITH_DOCS" != "" ]; then
fi fi
fi fi
unset _WITH_VALGRIND_CHECKED
_with_valgrind() {
_is_true "$WITH_VALGRIND" 0 || return 1
test "$_WITH_VALGRIND_CHECKED" == "1" && return 0
_WITH_VALGRIND_CHECKED=1
# Certain glib2 versions are known to report *lots* of leaks. Disable
# valgrind tests in this case.
# https://bugzilla.redhat.com/show_bug.cgi?id=1710417
if grep -q '^PRETTY_NAME="Fedora 30 (.*)"$' /etc/os-release ; then
if rpm -q glib2 | grep -q glib2-2.60.2-1.fc30 ; then
WITH_VALGRIND=0
fi
elif grep -q '^PRETTY_NAME="Fedora 31 (.*)"$' /etc/os-release; then
if rpm -q glib2 | grep -q glib2-2.61.0-2.fc31 ; then
WITH_VALGRIND=0
fi
fi
if [ "$WITH_VALGRIND" == 0 ]; then
echo "Don't use valgrind due to known issues in other packages."
return 1
fi
return 0
}
############################################################################### ###############################################################################
_print_test_logs() { _print_test_logs() {
@ -98,7 +124,7 @@ _print_test_logs() {
cat test-suite.log cat test-suite.log
fi fi
echo ">>>> PRINT TEST LOGS $1 (done)" echo ">>>> PRINT TEST LOGS $1 (done)"
if _is_true "$WITH_VALGRIND" 0; then if _with_valgrind; then
echo ">>>> PRINT VALGRIND LOGS $1 (start)" echo ">>>> PRINT VALGRIND LOGS $1 (start)"
find -name '*.valgrind-log' -print0 | xargs -0 grep -H ^ find -name '*.valgrind-log' -print0 | xargs -0 grep -H ^
echo ">>>> PRINT VALGRIND LOGS $1 (done)" echo ">>>> PRINT VALGRIND LOGS $1 (done)"
@ -166,7 +192,7 @@ run_autotools() {
die "test failed" die "test failed"
fi fi
if _is_true "$WITH_VALGRIND" 0; then if _with_valgrind; then
if ! NMTST_USE_VALGRIND=1 make check -j 3 -k ; then if ! NMTST_USE_VALGRIND=1 make check -j 3 -k ; then
_print_test_logs "(valgrind test)" _print_test_logs "(valgrind test)"
die "valgrind test failed" die "valgrind test failed"
@ -224,7 +250,7 @@ run_meson() {
ninja -C build ninja -C build
ninja -C build test ninja -C build test
if _is_true "$WITH_VALGRIND" 0; then if _with_valgrind; then
if ! NMTST_USE_VALGRIND=1 ninja -C build test; then if ! NMTST_USE_VALGRIND=1 ninja -C build test; then
_print_test_logs "(valgrind test)" _print_test_logs "(valgrind test)"
die "valgrind test failed" die "valgrind test failed"