aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:29:44 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:29:44 -0500
commit00ea2953484b380d572381a6e17b8c9aec1097e3 (patch)
tree64dd63272a08b81432e4f28f7f2ddd33da7af560 /tests
parent582b25fa3feb01f28196c6c26c898f859afeb808 (diff)
parent4fc9c62ab2356caeaac7fc7dd968bdf0cb838d46 (diff)
downloadlibdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.tar.gz
libdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.tar.bz2
libdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.zip
merge lp:~evgeni/dbusmenu/optional-valgrind to allow dbusmenu to build and run its non-valgrind checks on architectures where valgrind isn't available.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index df87dc8..c375562 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,10 +16,12 @@ TESTS = \
test-glib-submenu
if WANT_DBUSMENUDUMPER
+if HAVE_VALGRIND
TESTS += \
test-json \
test-json-instruction
endif
+endif
if WANT_LIBDBUSMENUGTK
TESTS += \
@@ -59,10 +61,12 @@ check_PROGRAMS = \
test-glib-simple-items
if WANT_DBUSMENUDUMPER
+if HAVE_VALGRIND
check_PROGRAMS += \
test-json-client \
test-json-server
endif
+endif
if WANT_LIBDBUSMENUGTK
check_PROGRAMS += \