diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
| commit | 3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff (patch) | |
| tree | 1722f023f4d1223106b9ec6cad9068b64b021a48 /tests/Makefile.am | |
| parent | ffb532bdd37d51a328c92258a3c1ee1fb6e9a787 (diff) | |
| parent | 4810423912b7f53f716ba5665aba56234461ca6f (diff) | |
| download | libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.gz libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.bz2 libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.zip | |
* Upstream Merge
* Build fixes to allow more optional builds
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a4763da..e6882af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,13 +13,17 @@ TESTS = \ test-glib-proxy \ test-glib-simple-items \ test-glib-submenu \ - test-json \ + test-json + +if WANT_LIBDBUSMENUGTK +TESTS += \ test-gtk-objects-test \ test-gtk-label \ test-gtk-shortcut \ test-gtk-reorder \ test-gtk-submenu \ test-gtk-parser-test +endif XFAIL_TESTS = \ test-glib-proxy @@ -44,20 +48,24 @@ check_PROGRAMS = \ test-glib-proxy-client \ test-glib-proxy-server \ test-glib-proxy-proxy \ - test-gtk-objects \ test-glib-submenu-client \ test-glib-submenu-server \ + test-glib-simple-items \ + test-json-client \ + test-json-server + +if WANT_LIBDBUSMENUGTK +check_PROGRAMS += \ + test-gtk-objects \ test-gtk-label-client \ test-gtk-label-server \ test-gtk-shortcut-client \ test-gtk-shortcut-server \ - test-glib-simple-items \ test-gtk-reorder-server \ - test-json-client \ - test-json-server \ test-gtk-submenu-server \ test-gtk-submenu-client \ test-gtk-parser +endif XVFB_RUN=". $(srcdir)/run-xvfb.sh" |