aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-09-20 00:03:25 -0500
committerTed Gould <ted@gould.cx>2011-09-20 00:03:25 -0500
commitfe5eed009fa38e9855fc3260967fcdaffe9d2ef0 (patch)
treef9c0327c928a40bc0c85209c6eb478b296adf4fe /tests/Makefile.am
parent0fca4c859e42bf3cafc6fa449dac3122996ed0c6 (diff)
parentc808cc90d518f9b010d937a13a8db0e8018fa9fd (diff)
downloadlibdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.gz
libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.tar.bz2
libdbusmenu-fe5eed009fa38e9855fc3260967fcdaffe9d2ef0.zip
New upstream release.
∘ Protect functions from NULL submenus (LP: #803667) ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, LP: #713690, LP: #643871, LP: #713685)
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e6882af..a4e8682 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,8 +12,12 @@ TESTS = \
test-glib-properties \
test-glib-proxy \
test-glib-simple-items \
- test-glib-submenu \
+ test-glib-submenu
+
+if WANT_DBUSMENUDUMPER
+TESTS += \
test-json
+endif
if WANT_LIBDBUSMENUGTK
TESTS += \
@@ -50,9 +54,13 @@ check_PROGRAMS = \
test-glib-proxy-proxy \
test-glib-submenu-client \
test-glib-submenu-server \
- test-glib-simple-items \
+ test-glib-simple-items
+
+if WANT_DBUSMENUDUMPER
+check_PROGRAMS += \
test-json-client \
test-json-server
+endif
if WANT_LIBDBUSMENUGTK
check_PROGRAMS += \