aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorAurelien Gateau <aurelien.gateau@canonical.com>2010-07-22 10:44:33 +0200
committerAurelien Gateau <aurelien.gateau@canonical.com>2010-07-22 10:44:33 +0200
commitfd7ffaa78b2c75db0b8138903d7272ed15641ce1 (patch)
tree01d39b5c710d7579b1c60a9c2925c16835c76602 /tests/Makefile.am
parentaccf3124c2a994078cf5b2520edcd5f841922c6c (diff)
downloadlibdbusmenu-fd7ffaa78b2c75db0b8138903d7272ed15641ce1.tar.gz
libdbusmenu-fd7ffaa78b2c75db0b8138903d7272ed15641ce1.tar.bz2
libdbusmenu-fd7ffaa78b2c75db0b8138903d7272ed15641ce1.zip
Fix menu order in submenus
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am47
1 files changed, 45 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 63857a2..9f621cb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,7 +14,8 @@ TESTS = \
test-gtk-objects-test \
test-gtk-label \
test-gtk-shortcut \
- test-gtk-reorder
+ test-gtk-reorder \
+ test-gtk-submenu
check_PROGRAMS = \
glib-server-nomenu \
@@ -36,7 +37,9 @@ check_PROGRAMS = \
test-glib-simple-items \
test-gtk-reorder-server \
test-json-client \
- test-json-server
+ test-json-server \
+ test-gtk-submenu-server \
+ test-gtk-submenu-client
XVFB_RUN=". $(srcdir)/run-xvfb.sh"
@@ -454,6 +457,46 @@ test_gtk_reorder_server_LDADD = \
$(DBUSMENUTESTS_LIBS)
#########################
+# Test GTK Submenu
+#########################
+
+test-gtk-submenu: test-gtk-submenu-client test-gtk-submenu-server Makefile.am
+ @echo "#!/bin/bash" > $@
+ @echo $(XVFB_RUN) >> $@
+ @echo $(DBUS_RUNNER) --task ./test-gtk-submenu-client --task-name Client --task ./test-gtk-submenu-server --task-name Server --ignore-return >> $@
+ @chmod +x $@
+
+test_gtk_submenu_server_SOURCES = \
+ test-gtk-submenu-server.c
+
+test_gtk_submenu_server_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(DBUSMENUGTK_CFLAGS) \
+ $(DBUSMENUTESTS_CFLAGS) \
+ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_gtk_submenu_server_LDADD = \
+ ../libdbusmenu-glib/libdbusmenu-glib.la \
+ ../libdbusmenu-gtk/libdbusmenu-gtk.la \
+ $(DBUSMENUGTK_LIBS) \
+ $(DBUSMENUTESTS_LIBS)
+
+test_gtk_submenu_client_SOURCES = \
+ test-gtk-submenu-client.c
+
+test_gtk_submenu_client_CFLAGS = \
+ -I $(srcdir)/.. \
+ $(DBUSMENUGTK_CFLAGS) \
+ $(DBUSMENUTESTS_CFLAGS) \
+ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_gtk_submenu_client_LDADD = \
+ ../libdbusmenu-glib/libdbusmenu-glib.la \
+ ../libdbusmenu-gtk/libdbusmenu-gtk.la \
+ $(DBUSMENUGTK_LIBS) \
+ $(DBUSMENUTESTS_LIBS)
+
+#########################
# Test Mago
#########################