diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-03-29 15:20:43 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-03-29 15:20:43 -0400 |
| commit | 8a0d944aa5c0578d55693f474599199471ce91e1 (patch) | |
| tree | de9d4f0b0aaf6bf530360d6a07c3b153902a7e6f /tests/Makefile.am | |
| parent | f6700613c6b065885a8184a0795fbf8f00632774 (diff) | |
| parent | 86a192f69a22c48c5aa3965310be3b04f1f3e379 (diff) | |
| download | libdbusmenu-8a0d944aa5c0578d55693f474599199471ce91e1.tar.gz libdbusmenu-8a0d944aa5c0578d55693f474599199471ce91e1.tar.bz2 libdbusmenu-8a0d944aa5c0578d55693f474599199471ce91e1.zip | |
* New upstream release.
* Faster menuitem lookups (LP: #801699)
* To reduce dbus traffic, only send event replies when the caller requests them
* Added support for callgrind-based benchmarks
* Minor code cleanup
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6824c1c..82f6a9d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,7 +16,8 @@ TESTS = \ if WANT_DBUSMENUDUMPER TESTS += \ - test-json + test-json \ + test-json-instruction endif if WANT_LIBDBUSMENUGTK @@ -208,7 +209,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 --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 --ignore-return --task ./test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json --ignore-return >> $@ @echo diff $(srcdir)/test-json-01.json test-json-01.output.json \> /dev/null >> $@ @chmod +x $@ @@ -242,6 +243,22 @@ test_json_client_LDADD = \ $(DBUSMENUTESTS_LIBS) \ $(DBUSMENUGLIB_LIBS) +######################### +# Test JSON Instructions +######################### + +test-json-instruction: test-json-client test-json-server test-json-instruction-count Makefile.am + @echo "#!/bin/bash" > $@ + @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 >> $@ + @chmod +x $@ + +EXTRA_DIST += \ + test-json-instruction-count + + ###################### # Test Glib Submenu ###################### |