[gtksourceview] build: use installed glib valgrind suppression file
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] build: use installed glib valgrind suppression file
- Date: Sun, 5 Mar 2017 16:13:08 +0000 (UTC)
commit 1172c513e99dd6f63019e0c28a8abc95059c242c
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Mar 5 17:07:10 2017 +0100
build: use installed glib valgrind suppression file
See:
https://git.gnome.org/browse/glib/commit/?id=a24f57b071758b01500e2b4b9c05d2a60f8280bf
configure.ac | 3 +++
testsuite/Makefile.am | 11 +++++------
2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 033a1d6..77876bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,9 @@ AX_CODE_COVERAGE()
AX_REQUIRE_DEFINED([AX_VALGRIND_CHECK])
AX_VALGRIND_CHECK
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+AC_SUBST([GLIB_PREFIX])
+
# Vala
AX_REQUIRE_DEFINED([VAPIGEN_CHECK])
VAPIGEN_CHECK
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 8625f86..55ede27 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -2,13 +2,12 @@
@VALGRIND_CHECK_RULES@
-# https://github.com/pwithnall/walbottle
# https://github.com/dtrebbien/GNOME.supp
-VALGRIND_SUPPRESSIONS_FILES = \
- $(top_srcdir)/../walbottle/libwalbottle/tests/walbottle.supp \
- $(top_srcdir)/../GNOME.supp/build/base.supp \
- $(top_srcdir)/../GNOME.supp/build/pango.supp \
- $(top_srcdir)/../GNOME.supp/build/gdk.supp \
+VALGRIND_SUPPRESSIONS_FILES = \
+ $(GLIB_PREFIX)/share/glib-2.0/valgrind/glib.supp \
+ $(top_srcdir)/../GNOME.supp/build/base.supp \
+ $(top_srcdir)/../GNOME.supp/build/pango.supp \
+ $(top_srcdir)/../GNOME.supp/build/gdk.supp \
$(top_srcdir)/../GNOME.supp/build/gtk3.supp
AM_CPPFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]