diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-09-20 11:08:27 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-09-20 11:08:27 -0500 |
| commit | 12e9a7a90e81528f14f2c8b46d93b4242bb831f0 (patch) | |
| tree | 57b44c1400077d86e0488ce943735a0f4e6c7af6 | |
| parent | 51762f3f455513c0d2066e1feda6edb14c8bd36d (diff) | |
| parent | 61ea13c1c60838570de64b026172dcf13d56ccb0 (diff) | |
| download | libdbusmenu-12e9a7a90e81528f14f2c8b46d93b4242bb831f0.tar.gz libdbusmenu-12e9a7a90e81528f14f2c8b46d93b4242bb831f0.tar.bz2 libdbusmenu-12e9a7a90e81528f14f2c8b46d93b4242bb831f0.zip | |
merge lp:~charlesk/dbusmenu/fix-json-tests to fix breakage in the test-json unit tests.
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c375562..0cd68d0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -237,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 $@ @@ -281,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 += \ |