aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-04 15:02:28 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-04 15:02:28 -0500
commit0bb911f850ebfd0f4ad2686966933272bb9bdefd (patch)
treef32b4b36df352e4356c1b524a1efc16a0c40e9aa /tests/Makefile.am
parentbc392e208fa1f9b46c77ea8142dadd629722663a (diff)
parent2d60549a2394ce7d73907abcaca22b48553d6c5b (diff)
downloadlibdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.tar.gz
libdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.tar.bz2
libdbusmenu-0bb911f850ebfd0f4ad2686966933272bb9bdefd.zip
Import upstream version 0.5.97
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am25
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 82f6a9d..df87dc8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST =
TESTS = \
test-glib-objects-test \
test-glib-events \
+ test-glib-events-nogroup \
test-glib-layout \
test-glib-properties \
test-glib-proxy \
@@ -45,6 +46,7 @@ check_PROGRAMS = \
test-glib-objects \
test-glib-events-client \
test-glib-events-server \
+ test-glib-events-nogroup-client \
test-glib-layout-client \
test-glib-layout-server \
test-glib-properties-client \
@@ -200,6 +202,28 @@ test_glib_events_client_LDADD = \
../libdbusmenu-glib/libdbusmenu-glib.la \
$(DBUSMENUGLIB_LIBS)
+################################
+# Test Glib Events No Grouping
+################################
+
+test-glib-events-nogroup: test-glib-events-nogroup-client test-glib-events-server Makefile.am
+ @echo "#!/bin/bash" > $@
+ @echo export UBUNTU_MENUPROXY="" >> $@
+ @echo export G_DEBUG=fatal_criticals >> $@
+ @echo $(DBUS_RUNNER) --task ./test-glib-events-nogroup-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
+ @chmod +x $@
+
+test_glib_events_nogroup_client_SOURCES = \
+ test-glib-events-nogroup-client.c
+
+test_glib_events_nogroup_client_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_events_nogroup_client_LDADD = \
+ ../libdbusmenu-glib/libdbusmenu-glib.la \
+ $(DBUSMENUGLIB_LIBS)
+
######################
# Test JSON
######################
@@ -223,6 +247,7 @@ test_json_server_CFLAGS = \
-I $(srcdir) \
$(DBUSMENUGLIB_CFLAGS) \
$(DBUSMENUTESTS_CFLAGS) \
+ $(DBUSMENUTESTSVALGRIND_CFLAGS) \
-Wall -Werror
test_json_server_LDADD = \