diff options
Diffstat (limited to 'tests/Makefile.in')
| -rw-r--r-- | tests/Makefile.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 100db43..9979700 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -41,7 +41,8 @@ TESTS = test-glib-objects-test test-glib-events test-glib-layout \ test-glib-simple-items$(EXEEXT) test-glib-submenu \ $(am__append_1) $(am__append_2) @WANT_DBUSMENUDUMPER_TRUE@am__append_1 = \ -@WANT_DBUSMENUDUMPER_TRUE@ test-json +@WANT_DBUSMENUDUMPER_TRUE@ test-json \ +@WANT_DBUSMENUDUMPER_TRUE@ test-json-instruction @WANT_LIBDBUSMENUGTK_TRUE@am__append_2 = \ @WANT_LIBDBUSMENUGTK_TRUE@ test-gtk-objects-test \ @@ -673,9 +674,10 @@ CLEANFILES = test-json-01.output.json test-gtk-shortcut-client.pyc \ dbusmenu-gtk/mago_tests/dbusmenu.pyc DISTCLEANFILES = $(OBJECT_XML_REPORT) $(GTK_OBJECT_XML_REPORT) \ $(GTK_PARSER_XML_REPORT) $(filter-out %.py, $(TESTS)) -EXTRA_DIST = test-glib-simple-items.py test-gtk-shortcut-client.py \ - $(examples_DATA) run-xvfb.sh $(json_DATA) test-gtk-objects.jpg \ - dbusmenu-gtk/dbusMenuTest dbusmenu-gtk/mago_tests/dbusmenu.xml \ +EXTRA_DIST = test-json-instruction-count test-glib-simple-items.py \ + test-gtk-shortcut-client.py $(examples_DATA) run-xvfb.sh \ + $(json_DATA) test-gtk-objects.jpg dbusmenu-gtk/dbusMenuTest \ + dbusmenu-gtk/mago_tests/dbusmenu.xml \ dbusmenu-gtk/mago_tests/dbusmenu.py \ dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \ dbusmenu-gtk/mago_tests/data/blank_label.json \ @@ -2099,10 +2101,22 @@ 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 $@ +######################### +# 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 $@ + ###################### # Test Glib Submenu ###################### |