diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-10 08:31:25 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-10 08:31:25 -0500 |
| commit | 9a98ea48a1a5708f304b4cee2a405cf5535a6dca (patch) | |
| tree | 294731375b4da74978dde8f4bc4d4739f3749a77 /tests/Makefile.am | |
| parent | 5e878bd6c21fe366d122385217bc7d2ce1368f65 (diff) | |
| parent | 445a8fb87482a15415b42cd296c4c3b57e571c47 (diff) | |
| download | libdbusmenu-9a98ea48a1a5708f304b4cee2a405cf5535a6dca.tar.gz libdbusmenu-9a98ea48a1a5708f304b4cee2a405cf5535a6dca.tar.bz2 libdbusmenu-9a98ea48a1a5708f304b4cee2a405cf5535a6dca.zip | |
* Upstream Merge
* Set the 'child-display' property on menuitems that
have child menuitems.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 35 |
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 |