2.13.6

[~andy/gtk] / Makefile.decl

diff --git a/Makefile.decl b/Makefile.decl
index 47f18e6546bfe16f95755da2f9051c7ae4dfa57a..edda74953183f3fe4de4d8afe647c00e1a0b9473 100644 (file)
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,6 +1,7 @@
 # GTK+ - The GIMP Toolkit
 
-GTESTER = gtester                      # for non-GLIB packages
+GTESTER        = gtester               # in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report                # in $PATH for non-GLIB packages
 
 # initialize variables for unconditional += appending
 EXTRA_DIST =
@@ -9,26 +10,29 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb
+XVFB = Xvfb -screen 0 800x600x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
   1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
   9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
   9995 9996 9997 9998 9999
+SKIP_GDKTARGET = \
+       test "$(gdktarget)" != "x11" \
+       && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
 XVFB_START = \
        ${XVFB} -help 2>/dev/null 1>&2 \
        && XID=`for id in $(XIDS) ; 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 & \
+       && { ${XVFB} :$$XID -screen 0 800x600x16 -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
+       || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+       && 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} ; \
+       @$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
+         $(XVFB_START) && { set -e; ${GTESTER} --verbose ${TEST_PROGS}; }; \
        }
        @ for subdir in $(SUBDIRS) ; do \
            test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
@@ -47,13 +51,14 @@ test-report perf-report full-report:        ${TEST_PROGS}
            test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done ; \
-         test -z "${TEST_PROGS}" || { \
+         $(SKIP_GDKTARGET) || 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) && { \
+             set -e; \
              if test -z "$$GTESTER_LOGDIR" ; then \
                ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
              elif test -n "${TEST_PROGS}" ; then \
@@ -70,6 +75,7 @@ test-report perf-report full-report:  ${TEST_PROGS}
            echo >> $@.xml ; \
            echo '</report-collection>' >> $@.xml ; \
            rm -rf "$$GTESTER_LOGDIR"/ ; \
+           ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
          }
 .PHONY: test test-report perf-report full-report
 # run make test as part of make check