diff options
| author | Ted Gould <ted@gould.cx> | 2012-01-30 23:20:48 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-01-30 23:20:48 -0600 |
| commit | 9332359a3cad3a5f23e7ff0c4bae14159818d026 (patch) | |
| tree | 372281b1a4a4c9abe902f2726277df5ddda18027 /tests/Makefile.am | |
| parent | f966667e6e1af74f06c65d8cfca78d0b861d5621 (diff) | |
| parent | 8d7a4ec5cbf30119b0ec553174853556a480228a (diff) | |
| download | libdbusmenu-9332359a3cad3a5f23e7ff0c4bae14159818d026.tar.gz libdbusmenu-9332359a3cad3a5f23e7ff0c4bae14159818d026.tar.bz2 libdbusmenu-9332359a3cad3a5f23e7ff0c4bae14159818d026.zip | |
Import upstream version 0.5.90
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a4e8682..532c14f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -DBUS_RUNNER=dbus-test-runner +DBUS_RUNNER=dbus-test-runner --max-wait=0 CLEANFILES= DISTCLEANFILES= @@ -29,9 +29,6 @@ TESTS += \ test-gtk-parser-test endif -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 @@ -86,7 +83,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b 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 |