diff options
author | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
---|---|---|
committer | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
commit | c4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch) | |
tree | 5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /tests/Makefile.am | |
parent | cfdd33a19758224cb835efa705a410d3d4d0db91 (diff) | |
parent | 3d800bf9b0133a613d28c31957c081d157a89af8 (diff) | |
download | libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2 libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip |
Mainline merge, resolve conflicts.
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 356146f..66f286b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,6 +8,7 @@ TESTS = \ test-glib-proxy \ test-glib-simple-items \ test-gtk-objects-test \ + test-glib-submenu \ test-gtk-label \ test-gtk-shortcut \ test-gtk-reorder @@ -23,6 +24,8 @@ check_PROGRAMS = \ test-glib-proxy-server \ test-glib-proxy-proxy \ test-gtk-objects \ + test-glib-submenu-client \ + test-glib-submenu-server \ test-gtk-label-client \ test-gtk-label-server \ test-gtk-shortcut-client \ @@ -80,6 +83,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 |