diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-02 11:17:44 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-02 11:17:44 -0500 |
| commit | 10cf92485ff65b6b5c17ee51fda006f079adc8c3 (patch) | |
| tree | 4a6bf839205cfbcd31e37b6b80af789de5b97d2c /tests/Makefile.am | |
| parent | ba87ab7a9a65c5ed349dda5c472ae6c8adbef322 (diff) | |
| parent | 8dbd3ed2a39b885de434da32079cd64ef264ba99 (diff) | |
| download | libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.tar.gz libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.tar.bz2 libdbusmenu-10cf92485ff65b6b5c17ee51fda006f079adc8c3.zip | |
Merging in Ubuntu Desktop branch.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 63857a2..839305f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,11 +10,11 @@ TESTS = \ test-glib-proxy \ test-glib-simple-items \ test-glib-submenu \ - test-json \ 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 +36,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 +456,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 ######################### |