diff options
| author | Didier Roche <didier.roche@canonical.com> | 2012-09-20 18:46:43 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2012-09-20 18:46:43 +0200 |
| commit | 7cc396a8a286cebb890aa718530d2acda63fa7df (patch) | |
| tree | 7cdde9cd0352fb262a893683b8b2c93e5a4f7ffe /tests/Makefile.am | |
| parent | 39588b350296d635de3dcbb4ea8499c8c693b90e (diff) | |
| parent | c36de4d59150df37ec782a17fb3d14424fb4734a (diff) | |
| download | libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.tar.gz libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.tar.bz2 libdbusmenu-7cc396a8a286cebb890aa718530d2acda63fa7df.zip | |
* New upstream release.
- Honor changes to GtkSettings' gtk-menu-images value (LP: #927236)
- don't display an underscore on menuitimes containing a '&' (LP: #994564)
- set the widget for the accelerator even if there isn't a mnemonic
(LP: #982656)
- make the vala bindings use pkg-config names, rather than gir ones
- Some platforms don't have valgrind, so treat those unit tests separately
- make headers match independent of the build directory
- constify some public API calls
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index df87dc8..0cd68d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,10 +16,12 @@ TESTS = \ test-glib-submenu if WANT_DBUSMENUDUMPER +if HAVE_VALGRIND TESTS += \ test-json \ test-json-instruction endif +endif if WANT_LIBDBUSMENUGTK TESTS += \ @@ -59,10 +61,12 @@ check_PROGRAMS = \ test-glib-simple-items if WANT_DBUSMENUDUMPER +if HAVE_VALGRIND check_PROGRAMS += \ test-json-client \ test-json-server endif +endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ @@ -233,7 +237,7 @@ test-json: test-json-client test-json-server Makefile.am @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter test-json-01.output.json --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ @chmod +x $@ @@ -277,7 +281,7 @@ test-json-instruction: test-json-client test-json-server test-json-instruction-c @echo export UBUNTU_MENUPROXY="" >> $@ @echo export G_DEBUG=fatal_criticals >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --ignore-return --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @chmod +x $@ EXTRA_DIST += \ |