initialize automake variables EXTRA_DIST and TEST_PROGS for unconditional

2007-11-22 15:48:26  Tim Janik  <timj@imendio.com>

        * Makefile.decl: initialize automake variables EXTRA_DIST and
	TEST_PROGS for unconditional appending via += in other makefiles.
	define recursive test targets: test, test-report, perf-report,
	full-report, as described here:
      http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html
	the test targets will execute Gtk+ test programs within an Xvfb session.

        * gtk/gtktestutils.c: call g_test_init() from gtk_test_init().

        * gtk/tests/testing.c: use g_test_add_func() to register tests and use
	g_test_run() to run the tests to integrate with the testing framework.

        * gtk/tests/Makefile.am: removed exemplary testing rules.

        * Makefile.am, gtk/tests/Makefile.am, gtk/Makefile.am:
        * gtk/xdgmime/Makefile.am, gtk/theme-bits/Makefile.am:
        * tests/Makefile.am, docs/reference/gdk-pixbuf/Makefile.am:
        * docs/reference/gdk/Makefile.am, docs/reference/gtk/Makefile.am:
        * docs/reference/Makefile.am, docs/tools/Makefile.am:
        * docs/tutorial/Makefile.am, docs/faq/Makefile.am, docs/Makefile.am:
        * gdk-pixbuf/pixops/Makefile.am, gdk-pixbuf/Makefile.am:
        * demos/gtk-demo/Makefile.am, demos/Makefile.am:
        * modules/input/Makefile.am, modules/printbackends/file/Makefile.am:
        * modules/printbackends/test/Makefile.am, modules/printbackends/Makefile.am:
        * modules/printbackends/cups/Makefile.am, modules/printbackends/lpr/Makefile.am:
        * modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am:
        * modules/engines/ms-windows/Theme/Makefile.am:
        * modules/engines/ms-windows/Makefile.am:
        * modules/engines/Makefile.am,  modules/engines/pixbuf/Makefile.am:
        * modules/Makefile.am, m4macros/Makefile.am, perf/Makefile.am:
        * contrib/Makefile.am, contrib/gdk-pixbuf-xlib/Makefile.am:
        * gdk/directfb/Makefile.am, gdk/linux-fb/Makefile.am:
        * gdk/quartz/Makefile.am, gdk/win32/rc/Makefile.am:
        * gdk/win32/Makefile.am, gdk/x11/Makefile.am, gdk/Makefile.am:
	include $(top_srcdir)/Makefile.decl, adapted EXTRA_DIST assignments.

svn path=/trunk/; revision=19034

diff --git a/ChangeLog b/ChangeLog
index b26b7ca83a3c3d233938ab53a7f8e8cf93d9b068..3c91ef7dfd95539aec18e7f1677697be61ed2658 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2007-11-22 15:39:40  Tim Janik  <timj@imendio.com>
+2007-11-22 15:48:26  Tim Janik  <timj@imendio.com>
+
+        * Makefile.decl: initialize automake variables EXTRA_DIST and
+       TEST_PROGS for unconditional appending via += in other makefiles.
+       define recursive test targets: test, test-report, perf-report,
+       full-report, as described here:
+      http://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html
+       the test targets will execute Gtk+ test programs within an Xvfb session.
 
         * gtk/gtktestutils.c: call g_test_init() from gtk_test_init().
 

diff --git a/Makefile.decl b/Makefile.decl
new file mode 100644 (file)
index 0000000..2963f2b
--- /dev/null
+++ b/Makefile.decl
@@ -0,0 +1,70 @@
+# GTK+ - The GIMP Toolkit
+
+GTESTER = gtester                      # for non-GLIB packages
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# Xvfb based test rules
+XVFB = Xvfb
+XVFB_START = \
+       ${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; exit 1; } \
+       && set -e ; DISPLAY=:$$XID; export DISPLAY
+# call as: $(XVFB_START) && someprogram
+
+# test: run all tests in cwd and subdirs
+test:  ${TEST_PROGS}
+       @$(XVFB_START) && { \
+         test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} ; \
+       }
+       @ for subdir in $(SUBDIRS) ; do \
+           test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+           ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+         done
+# test-report: run tests in subdirs and generate report
+# perf-report: run tests in subdirs with -m perf and generate report
+# full-report: like test-report: with -m perf and -m slow
+test-report perf-report full-report:   ${TEST_PROGS}
+       @test -z "${TEST_PROGS}" || { \
+         case $@ in \
+         test-report) test_options="-k";; \
+         perf-report) test_options="-k -m=perf";; \
+         full-report) test_options="-k -m=perf -m=slow";; \
+         esac ; \
+         $(XVFB_START) && { \
+           if test -z "$$GTESTER_LOGDIR" ; then \
+             ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
+           elif test -n "${TEST_PROGS}" ; then \
+             ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+           fi ; \
+         } \
+       }
+       @ ignore_logdir=true ; \
+         if test -z "$$GTESTER_LOGDIR" ; then \
+           GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
+           ignore_logdir=false ; \
+         fi ; \
+         for subdir in $(SUBDIRS) ; do \
+           test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
+           ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
+         done ; \
+         $$ignore_logdir || { \
+           echo '<?xml version="1.0"?>' > $@.xml ; \
+           echo '<report-collection>'  >> $@.xml ; \
+           for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
+             sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
+           done ; \
+           echo >> $@.xml ; \
+           echo '</report-collection>' >> $@.xml ; \
+           rm -rf "$$GTESTER_LOGDIR"/ ; \
+         }
+.PHONY: test test-report perf-report full-report
+# run make test as part of make check
+check-local: test