diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 3 | ||||
| -rw-r--r-- | gtk/gtktestutils.c | 1 | ||||
| -rw-r--r-- | gtk/tests/Makefile.am | 30 | ||||
| -rw-r--r-- | gtk/tests/testing.c | 14 | ||||
| -rw-r--r-- | gtk/theme-bits/Makefile.am | 4 | ||||
| -rw-r--r-- | gtk/xdgmime/Makefile.am | 2 |
6 files changed, 17 insertions, 37 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 44172157d2..79e2327320 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,4 +1,5 @@ # Makefile.am for gtk+/gtk +include $(top_srcdir)/Makefile.decl SUBDIRS = theme-bits . tests @@ -746,7 +747,7 @@ gtk_extra_sources = \ # MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) EXTRA_HEADERS = -EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources) +EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources) EXTRA_DIST += $(gtk_built_sources) EXTRA_DIST += $(STOCK_ICONS) diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c index 1dc4e37854..001a6a8e78 100644 --- a/gtk/gtktestutils.c +++ b/gtk/gtktestutils.c @@ -50,6 +50,7 @@ gtk_test_init (int *argcp, char ***argvp, ...) { + g_test_init (argcp, argvp, NULL); /* - enter C locale * - call g_test_init(); * - call gtk_init(); diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am index 1db22bc73a..9467e8a5bb 100644 --- a/gtk/tests/Makefile.am +++ b/gtk/tests/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ @@ -16,37 +18,9 @@ progs_ldadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) \ $(top_builddir)/gtk/$(gtktargetlib) -GTESTER = gtester - -TEST_PROGS = noinst_PROGRAMS = $(TEST_PROGS) TEST_PROGS += testing testing_SOURCES = testing.c testing_LDADD = $(progs_ldadd) - - - - - -# Xvfb based test rules -XVFB = Xvfb -test-xvfb: - ${XVFB} -help 2>/dev/null 1>&2 \ - && XID=`for id in \`seq 101 199\` ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ - && { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ - trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ - || { echo Failed to start Xvfb environment for testing; false; } \ - && set -e ; for prg in ${TEST_PROGS} ; do DISPLAY=:$$XID ./$$prg ; done - -# exemplary unit test rules -test: - set -e ; for prg in ${TEST_PROGS} ; do ./$$prg ; done -######### ${GTESTER} --verbose ${TEST_PROGS} -test-report: - $(MAKE) test -######### ${GTESTER} --verbose -k -o testreport.xml ${TEST_PROGS} -.PHONY: test test-report -check-local: test - diff --git a/gtk/tests/testing.c b/gtk/tests/testing.c index 9b56ea03a2..22cb861726 100644 --- a/gtk/tests/testing.c +++ b/gtk/tests/testing.c @@ -222,11 +222,11 @@ main (int argc, { gtk_test_init (&argc, &argv); gtk_test_register_all_types(); - test_text_access(); - test_button_clicks(); - test_button_keys(); - test_slider_ranges(); - test_xserver_sync(); - test_spin_button_arrows(); - return 0; + g_test_add_func ("/ui-tests/text-access", test_text_access); + g_test_add_func ("/ui-tests/button-clicks", test_button_clicks); + g_test_add_func ("/ui-tests/keys-events", test_button_keys); + g_test_add_func ("/ui-tests/slider-ranges", test_slider_ranges); + g_test_add_func ("/ui-tests/xserver-sync", test_xserver_sync); + g_test_add_func ("/ui-tests/spin-button-arrows", test_spin_button_arrows); + return g_test_run(); } diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am index 49a3c39a80..fad97cc368 100644 --- a/gtk/theme-bits/Makefile.am +++ b/gtk/theme-bits/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ $(GDK_PIXBUF_DEP_CFLAGS) @@ -7,4 +9,4 @@ noinst_PROGRAMS = decompose-bits decompose_bits_SOURCES = decompose-bits.c decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png +EXTRA_DIST += check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png diff --git a/gtk/xdgmime/Makefile.am b/gtk/xdgmime/Makefile.am index 9a46f12f8f..c153a12d36 100644 --- a/gtk/xdgmime/Makefile.am +++ b/gtk/xdgmime/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + INCLUDES = -DXDG_PREFIX=_gtk_xdg noinst_LTLIBRARIES = libxdgmime.la |