[cairo-commit] cairomm ChangeLog, 1.97, 1.98 Makefile.am, 1.11, 1.12 autogen.sh, 1.3, 1.4 configure.in, 1.27, 1.28

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm
In directory kemper:/tmp/cvs-serv24404

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.in 
Log Message:
2007-03-23  Jonathon Jongsma  <jjongsma at gnome.org>

	* Makefile.am:
	* autogen.sh:
	* configure.in:
	* m4/ax_boost_base.m4:
	* m4/ax_boost_unit_test_framework.m4: Add some basic test infrastructure.
	It's disabled by default, and must be explicitly enabled by passing
	--enable-tests to configure (or by setting the CAIROMM_DEVEL environment
	variable to "on").  It uses the boost unit test framework, but this should
	not be required unless you've explicitly enabled tests.  If tests are
	enabled, you can easily run them with 'make check'
	* tests/Makefile.am:
	* tests/test-context.cc: added the beginning of a test for Cairo::Context.
	Most of these tests are really very interesting.  Basically what I'm trying
	to do is a) test some basic behaviors, and b) excercise the functionality a
	little bit.  One of the tests currently fails due to a RefPtr::cast_dynamic
	failure, so I have to see what's going on there.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- ChangeLog	22 Mar 2007 21:21:09 -0000	1.97
+++ ChangeLog	24 Mar 2007 03:05:33 -0000	1.98
@@ -1,3 +1,22 @@
+2007-03-23  Jonathon Jongsma  <jjongsma at gnome.org>
+
+	* Makefile.am:
+	* autogen.sh:
+	* configure.in:
+	* m4/ax_boost_base.m4:
+	* m4/ax_boost_unit_test_framework.m4: Add some basic test infrastructure.
+	It's disabled by default, and must be explicitly enabled by passing
+	--enable-tests to configure (or by setting the CAIROMM_DEVEL environment
+	variable to "on").  It uses the boost unit test framework, but this should
+	not be required unless you've explicitly enabled tests.  If tests are
+	enabled, you can easily run them with 'make check'
+	* tests/Makefile.am:
+	* tests/test-context.cc: added the beginning of a test for Cairo::Context.
+	Most of these tests are really very interesting.  Basically what I'm trying
+	to do is a) test some basic behaviors, and b) excercise the functionality a
+	little bit.  One of the tests currently fails due to a RefPtr::cast_dynamic
+	failure, so I have to see what's going on there.
+
 2007-03-22  Murray Cumming  <murrayc at murrayc@murrayc.com>
 
 	* cairomm/enums.h: Restored FORMAT_RGB16_565 and marked it as deprecated.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairomm/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	20 Aug 2006 19:02:57 -0000	1.11
+++ Makefile.am	24 Mar 2007 03:05:33 -0000	1.12
@@ -1,7 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR)
+SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) tests
 #docs examples
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = MAINTAINERS cairomm-1.0.pc.in
 

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairomm/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- autogen.sh	13 Mar 2006 01:43:04 -0000	1.3
+++ autogen.sh	24 Mar 2007 03:05:33 -0000	1.4
@@ -35,6 +35,7 @@
 AUTOCONF=${AUTOCONF:-autoconf}
 AUTOMAKE=${AUTOMAKE:-automake}
 
+ACLOCAL_FLAGS="-I m4"
 ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
 
 rm -f config.cache acconfig.h
@@ -44,7 +45,7 @@
     $@
 }
 
-do_cmd $ACLOCAL
+do_cmd $ACLOCAL $ACLOCAL_FLAGS
 do_cmd $LIBTOOLIZE --force
 do_cmd $AUTOCONF
 do_cmd $AUTOMAKE --add-missing --gnu

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.in	21 Mar 2007 20:56:38 -0000	1.27
+++ configure.in	24 Mar 2007 03:05:33 -0000	1.28
@@ -28,7 +28,6 @@
 
 VERSION=$GENERIC_VERSION
 
-
 AM_INIT_AUTOMAKE(cairomm, $GENERIC_VERSION)
 
 AC_PROG_CXX
@@ -103,6 +102,26 @@
 
 PKG_CHECK_MODULES(CAIROMM, cairo >= 1.3.10)
 
+AC_ARG_ENABLE(tests,
+              AC_HELP_STRING([--enable-tests=yes|no],
+                             [enable automated tests (default is no)]),
+              ENABLE_TESTS=$enableval,
+              ENABLE_TESTS=no)
+if test x$CAIROMM_DEVEL = xon ; then
+    ENABLE_TESTS=yes
+fi
+
+if test x$ENABLE_TESTS = xyes ; then
+AX_BOOST_BASE([1.33.1])
+AX_BOOST_UNIT_TEST_FRAMEWORK
+AC_MSG_NOTICE(support of automated tests enabled)
+else
+    AC_MSG_NOTICE(disabled support of automated tests)
+fi
+AM_CONDITIONAL(AUTOTESTS, test x$ENABLE_TESTS = xyes)
+
+
+
 
 dnl Check whether to build the documentation directory
 DOCS_SUBDIR="" dnl set DOCS_SUBDIR initially blank
@@ -143,6 +162,8 @@
   examples/svg-surface/Makefile
   examples/text-rotate/Makefile
 
+  tests/Makefile
+
   cairomm-1.0.pc
 )