[maemo-commits] [maemo-commits] r15106 - in projects/haf/branches/hildon-1: . gtester gtester/doc gtester/examples gtester/pkgconfig gtester/src gtester/src/tests gtester/tests

Mon Jan 21 09:25:00 EET 2008

Author: tko
Date: 2008-01-21 09:24:58 +0200 (Mon, 21 Jan 2008)
New Revision: 15106

Added:
   projects/haf/branches/hildon-1/gtester/
   projects/haf/branches/hildon-1/gtester/Makefile.decl
   projects/haf/branches/hildon-1/gtester/src/tests/
   projects/haf/branches/hildon-1/gtester/src/tests/Makefile.am
Modified:
   projects/haf/branches/hildon-1/gtester/ChangeLog
   projects/haf/branches/hildon-1/gtester/Makefile.am
   projects/haf/branches/hildon-1/gtester/configure.ac
   projects/haf/branches/hildon-1/gtester/doc/Makefile.am
   projects/haf/branches/hildon-1/gtester/examples/Makefile.am
   projects/haf/branches/hildon-1/gtester/pkgconfig/Makefile.am
   projects/haf/branches/hildon-1/gtester/src/Makefile.am
   projects/haf/branches/hildon-1/gtester/tests/Makefile.am
Log:
Integrate glib testing framework into the build system.

2008-01-09  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* Makefile.decl: Copy from gtk+, with gdktarget and GTESTER variables
	added.
	* */Makefile.am: Add include $(top_srcdir)/Makefile.decl
	* configure.ac: Add src/tests/Makefile.am


Copied: projects/haf/branches/hildon-1/gtester (from rev 15104, projects/haf/trunk/hildon-1)

Modified: projects/haf/branches/hildon-1/gtester/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-1/ChangeLog	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/ChangeLog	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,12 @@
+2008-01-09  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	Integrate glib testing framework into the build system.
+
+	* Makefile.decl: Copy from gtk+, with gdktarget and GTESTER variables
+	added.
+	* */Makefile.am: Add include $(top_srcdir)/Makefile.decl
+	* configure.ac: Add src/tests/Makefile.am
+
 2008-01-10  Xan Lopez  <xan.lopez at nokia.com>
 
 	[2.0.1-1 release]

Modified: projects/haf/branches/hildon-1/gtester/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS 				= src 						\
 					  pkgconfig 					\
 					  examples 					\
@@ -5,7 +7,7 @@
 					  doc						\
 					  po
 
-EXTRA_DIST 				= debian/changelog 				\
+EXTRA_DIST 			       += debian/changelog 				\
 					  debian/control 				\
 					  debian/copyright 				\
 					  debian/hildon-libs-dev.docs 			\

Added: projects/haf/branches/hildon-1/gtester/Makefile.decl
===================================================================
--- projects/haf/trunk/hildon-1/Makefile.decl	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/Makefile.decl	2008-01-21 07:24:58 UTC (rev 15106)
@@ -0,0 +1,84 @@
+# GTK+ - The GIMP Toolkit
+
+gdktarget := $(shell pkg-config --variable=target gdk-2.0)
+
+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 =
+TEST_PROGS =
+
+### testing rules
+
+# Xvfb based test rules
+XVFB = Xvfb
+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 & \
+	       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/branches/hildon-1/gtester/configure.ac
===================================================================
--- projects/haf/trunk/hildon-1/configure.ac	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/configure.ac	2008-01-21 07:24:58 UTC (rev 15106)
@@ -181,6 +181,7 @@
 
 AC_CONFIG_FILES([Makefile               \
                  src/Makefile           \
+                 src/tests/Makefile     \
                  src/hildon-version.h   \
                  pkgconfig/Makefile     \
                  examples/Makefile      \

Modified: projects/haf/branches/hildon-1/gtester/doc/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/doc/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/doc/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 MAINTAINERCLEANFILES 				= Makefile.in				\
 						  hildon-sections.txt			\
 						  hildon-undocumented.txt		\
@@ -95,4 +97,3 @@
 FIXXREF_OPTIONS					=
 
 include $(top_srcdir)/doc/gtk-doc.make
-

Modified: projects/haf/branches/hildon-1/gtester/examples/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/examples/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/examples/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 MAINTAINERCLEANFILES			= Makefile.in
 
 if BUILD_EXAMPLES

Modified: projects/haf/branches/hildon-1/gtester/pkgconfig/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/pkgconfig/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/pkgconfig/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 MAINTAINERCLEANFILES			= Makefile.in
 
 all-local: hildon- at API_VERSION_MAJOR@.pc
@@ -8,6 +10,6 @@
 pkgconfigdir				= $(libdir)/pkgconfig
 pkgconfig_DATA				= hildon- at API_VERSION_MAJOR@.pc
 
-EXTRA_DIST				= hildon.pc.in
+EXTRA_DIST			       += hildon.pc.in
 CLEANFILES				= hildon- at API_VERSION_MAJOR@.pc
 

Modified: projects/haf/branches/hildon-1/gtester/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/src/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/src/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,7 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = . tests
+
 INCLUDES 						= -DG_LOG_DOMAIN=\"hildon- at API_VERSION_MAJOR@\" \
 							  -DLOCALEDIR=\"$(localedir)\"
 
@@ -7,7 +11,7 @@
 							  hildon-marshalers.h 				\
 							  hildon-marshalers.c
 
-EXTRA_DIST 						= hildon-marshalers.list
+EXTRA_DIST 					       += hildon-marshalers.list
 
 lib_LTLIBRARIES 					= libhildon- at API_VERSION_MAJOR@.la
 

Added: projects/haf/branches/hildon-1/gtester/src/tests/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/src/tests/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/src/tests/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -0,0 +1 @@
+include $(top_srcdir)/Makefile.decl

Modified: projects/haf/branches/hildon-1/gtester/tests/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/tests/Makefile.am	2008-01-17 17:34:48 UTC (rev 15104)
+++ projects/haf/branches/hildon-1/gtester/tests/Makefile.am	2008-01-21 07:24:58 UTC (rev 15106)
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 MAINTAINERCLEANFILES 					= Makefile.in
 
 if BUILD_TESTS 


