aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-06-10 16:45:25 -0400
committerKen VanDine <ken.vandine@canonical.com>2010-06-10 16:45:25 -0400
commitb2fb5abc22fa8e25f43f4af1e5a36a277a2f9058 (patch)
tree7b3492c11c2a1a76acbbda921762618516c24db8 /tests/Makefile.am
parent61ad4d5c68a37c07a9046640cfdf6f92e787c48c (diff)
parent858027328dada43f30eb2db96ecff33abd3b0974 (diff)
downloadlibdbusmenu-b2fb5abc22fa8e25f43f4af1e5a36a277a2f9058.tar.gz
libdbusmenu-b2fb5abc22fa8e25f43f4af1e5a36a277a2f9058.tar.bz2
libdbusmenu-b2fb5abc22fa8e25f43f4af1e5a36a277a2f9058.zip
* debian/control
- added doc packages - added build dep for gtk-doc-tools * debian/libdbusmenu-glib-doc.install added * debian/libdbusmenu-gtk-doc.install added * debian/rules - enabled gtk-doc for configure * New upstream release. * Set the 'child-display' property on menuitems that have child menuitems. * gtk-doc support * Document the 'shortcut' property * New upstream release. * Add function to get submenu of GTK-ified items * Fix signal prototype of ID update * Fixing up VAPI files to build them correctly * Fixing the version string in the GIR file * Fix documentation title page * Reject text nodes early (warnings with Qt integration) * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file names for package list. * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the typelib file.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am35
1 files changed, 35 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cfa1399..f1b50bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ TESTS = \
test-glib-properties \
test-glib-proxy \
test-glib-simple-items \
+ test-glib-submenu \
test-gtk-label \
test-gtk-reorder
@@ -20,6 +21,8 @@ check_PROGRAMS = \
test-glib-proxy-client \
test-glib-proxy-server \
test-glib-proxy-proxy \
+ test-glib-submenu-client \
+ test-glib-submenu-server \
test-gtk-label-client \
test-gtk-label-server \
test-glib-simple-items \
@@ -75,6 +78,38 @@ test_glib_layout_client_LDADD = \
../libdbusmenu-glib/libdbusmenu-glib.la \
$(DBUSMENUGLIB_LIBS)
+######################
+# Test Glib Submenu
+######################
+
+test-glib-submenu: test-glib-submenu-client test-glib-submenu-server Makefile.am
+ @echo "#!/bin/bash" > $@
+ @echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@
+ @chmod +x $@
+
+test_glib_submenu_server_SOURCES = \
+ test-glib-submenu.h \
+ test-glib-submenu-server.c
+
+test_glib_submenu_server_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_server_LDADD = \
+ ../libdbusmenu-glib/libdbusmenu-glib.la \
+ $(DBUSMENUGLIB_LIBS)
+
+test_glib_submenu_client_SOURCES = \
+ test-glib-submenu.h \
+ test-glib-submenu-client.c
+
+test_glib_submenu_client_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_client_LDADD = \
+ ../libdbusmenu-glib/libdbusmenu-glib.la \
+ $(DBUSMENUGLIB_LIBS)
######################
# Test Glib Object