call g_test_init() from gtk_test_init().

[~andy/gtk] / gtk / tests / Makefile.am

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 1db22bc73a0fdf4cb0ef0538ac3b139f68805f9f..9467e8a5bbe486f018788e944ad245df19dc2ccc 100644 (file)
--- 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
-