[maemo-commits] [maemo-commits] r16257 - in projects/haf/trunk/sapwood: . demos engine protocol server

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-09-29 14:12:36 +0300 (Mon, 29 Sep 2008)
New Revision: 16257

Added:
   projects/haf/trunk/sapwood/Makefile.decl
Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/Makefile.am
   projects/haf/trunk/sapwood/demos/Makefile.am
   projects/haf/trunk/sapwood/engine/Makefile.am
   projects/haf/trunk/sapwood/protocol/Makefile.am
   projects/haf/trunk/sapwood/server/Makefile.am
Log:
2008-09-23  Sven Herzberg  <sven at imendio.com>

	Add GTest support to the build system

	* Makefile.decl: file copied and adjusted to the project needs
	* Makefile.am,
	* demos/Makefile.am,
	* engine/Makefile.am,
	* protocol/Makefile.am,
	* server/Makefile.am: include Makefile.decl to support gtest
	everywhere


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,5 +1,17 @@
 2008-09-23  Sven Herzberg  <sven at imendio.com>
 
+	Add GTest support to the build system
+
+	* Makefile.decl: file copied and adjusted to the project needs
+	* Makefile.am,
+	* demos/Makefile.am,
+	* engine/Makefile.am,
+	* protocol/Makefile.am,
+	* server/Makefile.am: include Makefile.decl to support gtest
+	everywhere
+
+2008-09-23  Sven Herzberg  <sven at imendio.com>
+
 	Fix a possible double-free intorduced by r15921
 
 	* server/sapwood-server.c (process_buffer): drop the g_free() call on

Modified: projects/haf/trunk/sapwood/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/Makefile.am	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/Makefile.am	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS = protocol engine server demos
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 compile config.guess config.sub \
@@ -3,2 +5,4 @@
 		       configure depcomp install-sh ltmain.sh missing \
 		       mkinstalldirs
+
+EXTRA_DIST+=Makefile.decl

Added: projects/haf/trunk/sapwood/Makefile.decl
===================================================================
--- projects/haf/trunk/sapwood/Makefile.decl	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/Makefile.decl	2008-09-29 11:12:36 UTC (rev 16257)
@@ -0,0 +1,83 @@
+# GTK+ - The GIMP Toolkit
+
+GTESTER        = gtester		# in $PATH for non-GLIB packages
+GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
+gdktarget := $(shell pkg-config --variable=target gdk-2.0)
+
+# initialize variables for unconditional += appending
+EXTRA_DIST =
+TEST_PROGS =
+
+### testing rules
+
+# Xvfb based test rules
+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 -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+	|| { 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}
+	@$(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" || \
+	    ( 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}
+	@ 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 ; \
+	  $(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 \
+	        ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
+	      fi ; \
+	    }; \
+	  }; \
+	  $$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"/ ; \
+	    ${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
+check-local: test

Modified: projects/haf/trunk/sapwood/demos/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/demos/Makefile.am	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/demos/Makefile.am	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = $(GTK_CFLAGS)
 LDADD = $(GTK_LIBS)
 

Modified: projects/haf/trunk/sapwood/engine/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = $(GTK_CFLAGS) \
 	   -DSAPWOOD_SERVER=\"$(daemondir)/sapwood-server\" \
 	   -I$(top_srcdir)/protocol

Modified: projects/haf/trunk/sapwood/protocol/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/protocol/Makefile.am	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/protocol/Makefile.am	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
     $(GTK_CFLAGS) \
     -DSAPWOOD_SERVER=\"$(daemondir)/sapwood-server\"

Modified: projects/haf/trunk/sapwood/server/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/server/Makefile.am	2008-09-29 10:22:23 UTC (rev 16256)
+++ projects/haf/trunk/sapwood/server/Makefile.am	2008-09-29 11:12:36 UTC (rev 16257)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
     $(GDK_CFLAGS) \
     -I../protocol \