diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-01-31 10:07:09 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-01-31 10:07:09 -0500 |
| commit | c22d308ee469e5e253e694ec812a3d4ab5318ff7 (patch) | |
| tree | 0f489d0586d6c5701c663893e64d01190819e23e /tests/Makefile.in | |
| parent | 5447fecdeb4a3dda31d951555420105fd31b178e (diff) | |
| parent | d4a56efd670ae2432da8be9932df365c75ea0d72 (diff) | |
| download | libdbusmenu-c22d308ee469e5e253e694ec812a3d4ab5318ff7.tar.gz libdbusmenu-c22d308ee469e5e253e694ec812a3d4ab5318ff7.tar.bz2 libdbusmenu-c22d308ee469e5e253e694ec812a3d4ab5318ff7.zip | |
* New upstream release.
* Add property for accessible descriptions
* Use insert/remove signals on GTK3 build
* Change icon data to be a byte stream instead of base64
* Adjust GTK3 include path to match other libs
* Don't get objects from boolean values (LP: #870742)
* Fix depreactions on GTK3 (LP: #917115)
Diffstat (limited to 'tests/Makefile.in')
| -rw-r--r-- | tests/Makefile.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 1745f95..64d50b9 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -657,7 +657,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -DBUS_RUNNER = dbus-test-runner +DBUS_RUNNER = dbus-test-runner --max-wait=0 CLEANFILES = test-json-01.output.json test-gtk-shortcut-client.pyc \ dbusmenu-gtk/mago_tests/dbusmenu.pyc DISTCLEANFILES = $(OBJECT_XML_REPORT) $(GTK_OBJECT_XML_REPORT) \ @@ -683,9 +683,6 @@ EXTRA_DIST = test-glib-simple-items.py test-gtk-shortcut-client.py \ dbusmenu-gtk/mago_tests/data/static.json \ dbusmenu-gtk/mago_tests/data/test-gtk-label.json \ test-json-01.json -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 @@ -704,7 +701,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b # JSON Loader lib ###################### lib_LTLIBRARIES = libdbusmenu-jsonloader.la -libdbusmenu_jsonloaderincludedir = $(includedir)/libdbusmenu-0.4/libdbusmenu-jsonloader/ +libdbusmenu_jsonloaderincludedir = $(includedir)/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ libdbusmenu_jsonloaderinclude_HEADERS = \ json-loader.h |