[svn] commit: r111 - in /branches/jinmei-cppunittests: Makefile.in configure configure.ac src/Makefile.in src/lib/Makefile.in src/lib/dns/Makefile.am src/lib/dns/Makefile.in src/lib/dns/name_boosttest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Oct 20 22:31:51 UTC 2009
Author: jinmei
Date: Tue Oct 20 22:31:50 2009
New Revision: 111
Log:
supported Boost.Test (partially...)
Added:
branches/jinmei-cppunittests/src/lib/dns/name_boosttest.cc
Modified:
branches/jinmei-cppunittests/Makefile.in
branches/jinmei-cppunittests/configure
branches/jinmei-cppunittests/configure.ac
branches/jinmei-cppunittests/src/Makefile.in
branches/jinmei-cppunittests/src/lib/Makefile.in
branches/jinmei-cppunittests/src/lib/dns/Makefile.am
branches/jinmei-cppunittests/src/lib/dns/Makefile.in
Modified: branches/jinmei-cppunittests/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/Makefile.in (original)
+++ branches/jinmei-cppunittests/Makefile.in Tue Oct 20 22:31:50 2009
@@ -105,6 +105,9 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BOOSTTEST_LDADD = @BOOSTTEST_LDADD@
+BOOST_INCLUDES = @BOOST_INCLUDES@
+BOOST_LDFLAGS = @BOOST_LDFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
Modified: branches/jinmei-cppunittests/configure
==============================================================================
--- branches/jinmei-cppunittests/configure (original)
+++ branches/jinmei-cppunittests/configure Tue Oct 20 22:31:50 2009
@@ -609,6 +609,11 @@
CPPUNIT_INCLUDES
HAVE_CPPUNIT_FALSE
HAVE_CPPUNIT_TRUE
+USE_BOOSTTEST_FALSE
+USE_BOOSTTEST_TRUE
+BOOSTTEST_LDADD
+BOOST_LDFLAGS
+BOOST_INCLUDES
EGREP
GREP
CPP
@@ -701,6 +706,8 @@
ac_user_opts='
enable_option_checking
enable_dependency_tracking
+with_boost
+with_boosttest
with_cppunit
with_cxxtest
with_gtest
@@ -1338,6 +1345,8 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-boost=PATH specify a path to Boost header files (PATH/include) and library (PATH/lib)
+ --with-boosttest whether to use Boost.test for unit tests (requiring boost)
--with-cppunit=PATH specify a path to CppUnit header files (PATH/include) and library (PATH/lib)
--with-cxxtest=PATH specify a path to CxxTest script (PATH/cxxtestgen.pl) and header files (PATH/cxxtest/)
--with-gtest=PATH specify a path to Gtest header files (PATH/include) and library (PATH/lib)
@@ -4537,6 +4546,51 @@
#
+# Check availablity of boost
+#
+
+# Check whether --with-boost was given.
+if test "${with_boost+set}" = set; then :
+ withval=$with_boost; boost_path="$withval"
+else
+ boost_path="no"
+fi
+
+if test "$boost_path" != "no"
+then
+ BOOST_INCLUDES="-I${boost_path}/include"
+ BOOST_LDFLAGS="-L${boost_path}/lib"
+else
+ BOOST_INCLUDES=
+ BOOST_LDFLAGS=
+fi
+
+
+
+# Check whether to use Boost.Test
+
+# Check whether --with-boosttest was given.
+if test "${with_boosttest+set}" = set; then :
+ withval=$with_boosttest; use_boosttest="$withval"
+else
+ use_boosttest="no"
+fi
+
+if test "$use_boosttest" != "no"
+then
+BOOSTTEST_LDADD="-lboost_unit_test_framework-mt"
+
+fi
+ if test $use_boosttest != "no"; then
+ USE_BOOSTTEST_TRUE=
+ USE_BOOSTTEST_FALSE='#'
+else
+ USE_BOOSTTEST_TRUE='#'
+ USE_BOOSTTEST_FALSE=
+fi
+
+
+#
# Check availablity of CppUnit, which will be used for unit tests.
#
@@ -4750,6 +4804,10 @@
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_BOOSTTEST_TRUE}" && test -z "${USE_BOOSTTEST_FALSE}"; then
+ as_fn_error "conditional \"USE_BOOSTTEST\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_CPPUNIT_TRUE}" && test -z "${HAVE_CPPUNIT_FALSE}"; then
Modified: branches/jinmei-cppunittests/configure.ac
==============================================================================
--- branches/jinmei-cppunittests/configure.ac (original)
+++ branches/jinmei-cppunittests/configure.ac Tue Oct 20 22:31:50 2009
@@ -22,6 +22,34 @@
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
AC_TYPE_SIZE_T
+
+#
+# Check availablity of boost
+#
+AC_ARG_WITH(boost,
+[ --with-boost=PATH specify a path to Boost header files (PATH/include) and library (PATH/lib)],
+ boost_path="$withval", boost_path="no")
+if test "$boost_path" != "no"
+then
+ BOOST_INCLUDES="-I${boost_path}/include"
+ BOOST_LDFLAGS="-L${boost_path}/lib"
+else
+ BOOST_INCLUDES=
+ BOOST_LDFLAGS=
+fi
+AC_SUBST(BOOST_INCLUDES)
+AC_SUBST(BOOST_LDFLAGS)
+
+# Check whether to use Boost.Test
+AC_ARG_WITH(boosttest,
+[ --with-boosttest whether to use Boost.test for unit tests (requiring boost)],
+ use_boosttest="$withval", use_boosttest="no")
+if test "$use_boosttest" != "no"
+then
+BOOSTTEST_LDADD="-lboost_unit_test_framework-mt"
+AC_SUBST(BOOSTTEST_LDADD)
+fi
+AM_CONDITIONAL(USE_BOOSTTEST, test $use_boosttest != "no")
#
# Check availablity of CppUnit, which will be used for unit tests.
Modified: branches/jinmei-cppunittests/src/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/src/Makefile.in (original)
+++ branches/jinmei-cppunittests/src/Makefile.in Tue Oct 20 22:31:50 2009
@@ -90,6 +90,9 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BOOSTTEST_LDADD = @BOOSTTEST_LDADD@
+BOOST_INCLUDES = @BOOST_INCLUDES@
+BOOST_LDFLAGS = @BOOST_LDFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
Modified: branches/jinmei-cppunittests/src/lib/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/src/lib/Makefile.in (original)
+++ branches/jinmei-cppunittests/src/lib/Makefile.in Tue Oct 20 22:31:50 2009
@@ -90,6 +90,9 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BOOSTTEST_LDADD = @BOOSTTEST_LDADD@
+BOOST_INCLUDES = @BOOST_INCLUDES@
+BOOST_LDFLAGS = @BOOST_LDFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
Modified: branches/jinmei-cppunittests/src/lib/dns/Makefile.am
==============================================================================
--- branches/jinmei-cppunittests/src/lib/dns/Makefile.am (original)
+++ branches/jinmei-cppunittests/src/lib/dns/Makefile.am Tue Oct 20 22:31:50 2009
@@ -32,4 +32,12 @@
run_gtests_LDADD = ./libdns.a $(GTEST_LDADD)
endif
+if USE_BOOSTTEST
+TESTS += run_boosttests
+run_boosttests_SOURCES = name_boosttest.cc
+run_boosttests_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_INCLUDES)
+run_boosttests_LDFLAGS = $(BOOST_LDFLAGS)
+run_boosttests_LDADD = ./libdns.a $(BOOSTTEST_LDADD)
+endif
+
noinst_PROGRAMS = $(TESTS)
Modified: branches/jinmei-cppunittests/src/lib/dns/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/src/lib/dns/Makefile.in (original)
+++ branches/jinmei-cppunittests/src/lib/dns/Makefile.in Tue Oct 20 22:31:50 2009
@@ -33,11 +33,13 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+ $(am__EXEEXT_4)
@HAVE_CPPUNIT_TRUE at am__append_1 = run_unittests
@HAVE_CXXTEST_TRUE at am__append_2 = run_cxxtests
@HAVE_GTEST_TRUE at am__append_3 = run_gtests
-noinst_PROGRAMS = $(am__EXEEXT_4)
+ at USE_BOOSTTEST_TRUE@am__append_4 = run_boosttests
+noinst_PROGRAMS = $(am__EXEEXT_5)
subdir = src/lib/dns
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -80,8 +82,19 @@
@HAVE_CPPUNIT_TRUE at am__EXEEXT_1 = run_unittests$(EXEEXT)
@HAVE_CXXTEST_TRUE at am__EXEEXT_2 = run_cxxtests$(EXEEXT)
@HAVE_GTEST_TRUE at am__EXEEXT_3 = run_gtests$(EXEEXT)
-am__EXEEXT_4 = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+ at USE_BOOSTTEST_TRUE@am__EXEEXT_4 = run_boosttests$(EXEEXT)
+am__EXEEXT_5 = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+ $(am__EXEEXT_4)
PROGRAMS = $(noinst_PROGRAMS)
+am__run_boosttests_SOURCES_DIST = name_boosttest.cc
+ at USE_BOOSTTEST_TRUE@am_run_boosttests_OBJECTS = \
+ at USE_BOOSTTEST_TRUE@ run_boosttests-name_boosttest.$(OBJEXT)
+run_boosttests_OBJECTS = $(am_run_boosttests_OBJECTS)
+am__DEPENDENCIES_1 =
+ at USE_BOOSTTEST_TRUE@run_boosttests_DEPENDENCIES = ./libdns.a \
+ at USE_BOOSTTEST_TRUE@ $(am__DEPENDENCIES_1)
+run_boosttests_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(run_boosttests_LDFLAGS) $(LDFLAGS) -o $@
am__run_cxxtests_SOURCES_DIST = name_cxxtest.cc
@HAVE_CXXTEST_TRUE at am_run_cxxtests_OBJECTS = \
@HAVE_CXXTEST_TRUE@ run_cxxtests-name_cxxtest.$(OBJEXT)
@@ -91,7 +104,6 @@
@HAVE_GTEST_TRUE at am_run_gtests_OBJECTS = \
@HAVE_GTEST_TRUE@ run_gtests-name_gtest.$(OBJEXT)
run_gtests_OBJECTS = $(am_run_gtests_OBJECTS)
-am__DEPENDENCIES_1 =
@HAVE_GTEST_TRUE at run_gtests_DEPENDENCIES = ./libdns.a \
@HAVE_GTEST_TRUE@ $(am__DEPENDENCIES_1)
run_gtests_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -118,9 +130,11 @@
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libdns_a_SOURCES) $(run_cxxtests_SOURCES) \
- $(run_gtests_SOURCES) $(run_unittests_SOURCES)
-DIST_SOURCES = $(libdns_a_SOURCES) $(am__run_cxxtests_SOURCES_DIST) \
+SOURCES = $(libdns_a_SOURCES) $(run_boosttests_SOURCES) \
+ $(run_cxxtests_SOURCES) $(run_gtests_SOURCES) \
+ $(run_unittests_SOURCES)
+DIST_SOURCES = $(libdns_a_SOURCES) $(am__run_boosttests_SOURCES_DIST) \
+ $(am__run_cxxtests_SOURCES_DIST) \
$(am__run_gtests_SOURCES_DIST) \
$(am__run_unittests_SOURCES_DIST)
ETAGS = etags
@@ -134,6 +148,9 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BOOSTTEST_LDADD = @BOOSTTEST_LDADD@
+BOOST_INCLUDES = @BOOST_INCLUDES@
+BOOST_LDFLAGS = @BOOST_LDFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -243,6 +260,10 @@
@HAVE_GTEST_TRUE at run_gtests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
@HAVE_GTEST_TRUE at run_gtests_LDFLAGS = $(GTEST_LDFLAGS)
@HAVE_GTEST_TRUE at run_gtests_LDADD = ./libdns.a $(GTEST_LDADD)
+ at USE_BOOSTTEST_TRUE@run_boosttests_SOURCES = name_boosttest.cc
+ at USE_BOOSTTEST_TRUE@run_boosttests_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_INCLUDES)
+ at USE_BOOSTTEST_TRUE@run_boosttests_LDFLAGS = $(BOOST_LDFLAGS)
+ at USE_BOOSTTEST_TRUE@run_boosttests_LDADD = ./libdns.a $(BOOSTTEST_LDADD)
all: all-am
.SUFFIXES:
@@ -316,6 +337,9 @@
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+run_boosttests$(EXEEXT): $(run_boosttests_OBJECTS) $(run_boosttests_DEPENDENCIES)
+ @rm -f run_boosttests$(EXEEXT)
+ $(run_boosttests_LINK) $(run_boosttests_OBJECTS) $(run_boosttests_LDADD) $(LIBS)
run_cxxtests$(EXEEXT): $(run_cxxtests_OBJECTS) $(run_cxxtests_DEPENDENCIES)
@rm -f run_cxxtests$(EXEEXT)
$(CXXLINK) $(run_cxxtests_OBJECTS) $(run_cxxtests_LDADD) $(LIBS)
@@ -333,6 +357,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/name.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_boosttests-name_boosttest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_cxxtests-name_cxxtest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_gtests-name_gtest.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_unittests-name_unittest.Po at am__quote@
@@ -351,6 +376,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+run_boosttests-name_boosttest.o: name_boosttest.cc
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_boosttests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_boosttests-name_boosttest.o -MD -MP -MF $(DEPDIR)/run_boosttests-name_boosttest.Tpo -c -o run_boosttests-name_boosttest.o `test -f 'name_boosttest.cc' || echo '$(srcdir)/'`name_boosttest.cc
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_boosttests-name_boosttest.Tpo $(DEPDIR)/run_boosttests-name_boosttest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_boosttest.cc' object='run_boosttests-name_boosttest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_boosttests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_boosttests-name_boosttest.o `test -f 'name_boosttest.cc' || echo '$(srcdir)/'`name_boosttest.cc
+
+run_boosttests-name_boosttest.obj: name_boosttest.cc
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_boosttests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_boosttests-name_boosttest.obj -MD -MP -MF $(DEPDIR)/run_boosttests-name_boosttest.Tpo -c -o run_boosttests-name_boosttest.obj `if test -f 'name_boosttest.cc'; then $(CYGPATH_W) 'name_boosttest.cc'; else $(CYGPATH_W) '$(srcdir)/name_boosttest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_boosttests-name_boosttest.Tpo $(DEPDIR)/run_boosttests-name_boosttest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_boosttest.cc' object='run_boosttests-name_boosttest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_boosttests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_boosttests-name_boosttest.obj `if test -f 'name_boosttest.cc'; then $(CYGPATH_W) 'name_boosttest.cc'; else $(CYGPATH_W) '$(srcdir)/name_boosttest.cc'; fi`
run_cxxtests-name_cxxtest.o: name_cxxtest.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_cxxtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_cxxtests-name_cxxtest.o -MD -MP -MF $(DEPDIR)/run_cxxtests-name_cxxtest.Tpo -c -o run_cxxtests-name_cxxtest.o `test -f 'name_cxxtest.cc' || echo '$(srcdir)/'`name_cxxtest.cc
More information about the bind10-changes
mailing list