diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-18 16:08:09 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-06-18 16:08:09 -0500 |
| commit | 54fd03c702247158b4c238a4f1e59d80fd6a5145 (patch) | |
| tree | 37fcd8b4ba5cc49e48f5f666213a54f6efcc1042 | |
| parent | ad2a11e5f03fb48c74af8e4c0dd09f954cf967a9 (diff) | |
| download | libdbusmenu-54fd03c702247158b4c238a4f1e59d80fd6a5145.tar.gz libdbusmenu-54fd03c702247158b4c238a4f1e59d80fd6a5145.tar.bz2 libdbusmenu-54fd03c702247158b4c238a4f1e59d80fd6a5145.zip | |
run test-gtk-remove inside of dbus-test-runner
| -rw-r--r-- | tests/Makefile.am | 19 | ||||
| -rw-r--r-- | tests/test-gtk-remove-server.c (renamed from tests/test-gtk-remove.c) | 0 |
2 files changed, 14 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fbaaf5..0977356 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -78,11 +78,11 @@ endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ test-gtk-objects \ - test-gtk-remove \ test-gtk-label-client \ test-gtk-label-server \ test-gtk-shortcut-client \ test-gtk-shortcut-server \ + test-gtk-remove-server \ test-gtk-reorder-server \ test-gtk-submenu-server \ test-gtk-submenu-client \ @@ -632,21 +632,30 @@ CLEANFILES += test-gtk-shortcut-client.pyc # Test GTK Remove ######################### -test_gtk_remove_SOURCES = \ - test-gtk-remove.c +test-gtk-remove: test-gtk-remove-server Makefile.am + @echo "#!/bin/bash" > $@ + @echo export UBUNTU_MENUPROXY="" >> $@ + @echo export G_DEBUG=fatal_criticals >> $@ + @echo $(XVFB_RUN) >> $@ + @echo $(DBUS_RUNNER) --task ./test-gtk-remove-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ + @chmod +x $@ + +test_gtk_remove_server_SOURCES = \ + test-gtk-remove-server.c -test_gtk_remove_CFLAGS = \ +test_gtk_remove_server_CFLAGS = \ -I $(top_srcdir) \ $(DBUSMENUGTK_CFLAGS) \ $(DBUSMENUTESTS_CFLAGS) \ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -test_gtk_remove_LDADD = \ +test_gtk_remove_server_LDADD = \ $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la \ $(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) + ######################### # Test GTK Reorder ######################### diff --git a/tests/test-gtk-remove.c b/tests/test-gtk-remove-server.c index 0655fc0..0655fc0 100644 --- a/tests/test-gtk-remove.c +++ b/tests/test-gtk-remove-server.c |