diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-06-24 14:15:33 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-06-24 14:15:33 -0400 |
| commit | 9a8c84b879e78aa8e0a9c1759fc5b73a29efd116 (patch) | |
| tree | 8471f1da76c5592c05fffb462337726c43b81db5 /tests/Makefile.am | |
| parent | 565603d992afa03da6a8f485fcdbe8b71677f7db (diff) | |
| parent | b08640dfaa65d54ac758e14f103e92bdc20990e0 (diff) | |
| download | libdbusmenu-9a8c84b879e78aa8e0a9c1759fc5b73a29efd116.tar.gz libdbusmenu-9a8c84b879e78aa8e0a9c1759fc5b73a29efd116.tar.bz2 libdbusmenu-9a8c84b879e78aa8e0a9c1759fc5b73a29efd116.zip | |
* debian/control, debian/*: Renaming packages for library version
bump from 3 to 4.
* New upstream release.
* Fixing visibility for Eclipse (LP: #770263 and LP: #618587)
* Unseting a GValue properly (LP: #785828)
* Memory leaks for GVariant usage (LP: #784890)
* Making GTK 3 default build
* Removing the SerializableMenuitem object
* debian/rules: Making GTK2 the special build
* New upstream release.
- Fix a typo in the signal name to make it match the XML
files (LP: #641209)
- Ref'ing the server for the entire time we're getting the
bus (LP: #738568)
- Watch additions/removals from submenus that get added
- Activate new toplevel menu items as they get added
- Make sure we don't activate toplevel children that aren't
menu items or don't have submenus (LP: #761112)
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a2c0716..a4763da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,6 +21,9 @@ TESTS = \ test-gtk-submenu \ test-gtk-parser-test +XFAIL_TESTS = \ + test-glib-proxy + # The Python test only work on the system copy of # dbusmenu, so while they can be usefule they're not # good tests of what you're currently building. Handy @@ -399,7 +402,7 @@ test_gtk_objects_CFLAGS = \ test_gtk_objects_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGLIB_LIBS) \ $(DBUSMENUGTK_LIBS) @@ -429,7 +432,7 @@ test_gtk_parser_CFLAGS = \ test_gtk_parser_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGLIB_LIBS) \ $(DBUSMENUGTK_LIBS) @@ -456,7 +459,7 @@ test_gtk_label_server_CFLAGS = \ test_gtk_label_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ libdbusmenu-jsonloader.la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -472,7 +475,7 @@ test_gtk_label_client_CFLAGS = \ test_gtk_label_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -497,7 +500,7 @@ test_gtk_shortcut_server_CFLAGS = \ test_gtk_shortcut_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -512,7 +515,7 @@ test_gtk_shortcut_client_CFLAGS = \ test_gtk_shortcut_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -550,7 +553,7 @@ test_gtk_reorder_server_CFLAGS = \ test_gtk_reorder_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -575,7 +578,7 @@ test_gtk_submenu_server_CFLAGS = \ test_gtk_submenu_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -590,7 +593,7 @@ test_gtk_submenu_client_CFLAGS = \ test_gtk_submenu_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ - ../libdbusmenu-gtk/libdbusmenu-gtk.la \ + ../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) @@ -658,3 +661,8 @@ distclean-local: DISTCLEANFILES += \ $(filter-out %.py, $(TESTS)) +if USE_GTK3 +VER=3 +else +VER= +endif |