From 53a788177165a0295338eb9a98c3b7711c3a4250 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Mon, 17 Apr 2017 11:39:34 +0200
Subject: [PATCH] Add testsuite (disabled for now)

---
 libdbusmenu.spec | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/libdbusmenu.spec b/libdbusmenu.spec
index 7f14af9..a112111 100644
--- a/libdbusmenu.spec
+++ b/libdbusmenu.spec
@@ -4,9 +4,12 @@
 
 %global ubuntu_release 16.04
 
+# Set to 1 to run testsuite
+%global with_tests 0
+
 Name:       libdbusmenu
 Version:    %{ubuntu_release}.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Library for passing menus over DBus
 
 # All files installed in final rpms use C sources with dual licensing headers.
@@ -35,12 +38,19 @@ BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.10
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.16
 BuildRequires:  pkgconfig(gtk+-3.0) >= 2.91
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.13.4
-BuildRequires:  pkgconfig(valgrind)
 BuildRequires:  pkgconfig(x11) >= 1.3
 BuildRequires:  python
 BuildRequires:  vala-devel
 BuildRequires:  vala-tools
 
+# pkgconfig file is checked for valgrind, but is actually only used for tests
+# https://bugzilla.redhat.com/show_bug.cgi?id=1262274
+# BuildRequires:  pkgconfig(valgrind)
+%if 0%{?with_tests}
+BuildRequires:  dbus-test-runner
+BuildRequires:  valgrind
+%endif
+
 %description
 This is a small library designed to make sharing and displaying of menu
 structures over DBus simple and easy to use. It works for both QT and GTK+ and
@@ -162,6 +172,15 @@ popd
 # Let rpmbuild pick the documents in the files section
 rm -fr %{buildroot}%{_docdir}/%{name}
 
+%if 0%{?with_tests}
+%check
+for variant in %{name}-gtk3-%{version} %{name}-%{version}; do
+    pushd $variant
+        make check V=1
+    popd
+done
+%endif
+
 %post -p /sbin/ldconfig
 %post gtk2 -p /sbin/ldconfig
 %post gtk3 -p /sbin/ldconfig
@@ -237,6 +256,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %{_datadir}/%{name}/json/test-gtk-label.json
 
 %changelog
+* Mon Apr 17 2017 Simone Caronni <negativo17@gmail.com> - 16.04.0-2
+- Add tests, remove valgrind-devel build requirements (#1262274).
+- Disable tests until dbus-test-runner is available.
+
 * Sun Apr 16 2017 Simone Caronni <negativo17@gmail.com> - 16.04.0-1
 - Update to 16.04.0.