[svn] commit: r100 - 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_cxxtest.h src/lib/dns/name_gtest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Oct 20 00:58:20 UTC 2009
Author: jinmei
Date: Tue Oct 20 00:58:20 2009
New Revision: 100
Log:
supported googletest (gtest)
Added:
branches/jinmei-cppunittests/src/lib/dns/name_gtest.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
branches/jinmei-cppunittests/src/lib/dns/name_cxxtest.h
Modified: branches/jinmei-cppunittests/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/Makefile.in (original)
+++ branches/jinmei-cppunittests/Makefile.in Tue Oct 20 00:58:20 2009
@@ -127,6 +127,9 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
+GTEST_INCLUDES = @GTEST_INCLUDES@
+GTEST_LDADD = @GTEST_LDADD@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Modified: branches/jinmei-cppunittests/configure
==============================================================================
--- branches/jinmei-cppunittests/configure (original)
+++ branches/jinmei-cppunittests/configure Tue Oct 20 00:58:20 2009
@@ -595,6 +595,11 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+GTEST_LDADD
+GTEST_LDFLAGS
+GTEST_INCLUDES
+HAVE_GTEST_FALSE
+HAVE_GTEST_TRUE
CXXTEST_INCLUDES
CXXTEST_PATH
HAVE_CXXTEST_FALSE
@@ -698,6 +703,7 @@
enable_dependency_tracking
with_cppunit
with_cxxtest
+with_gtest
'
ac_precious_vars='build_alias
host_alias
@@ -1334,6 +1340,7 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--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)
Some influential environment variables:
CXX C++ compiler command
@@ -4562,6 +4569,9 @@
+#
+# Check availablity of CxxUnit, which may be used for unit tests.
+#
# Check whether --with-cxxtest was given.
if test "${with_cxxtest+set}" = set; then :
@@ -4584,6 +4594,39 @@
HAVE_CXXTEST_TRUE='#'
HAVE_CXXTEST_FALSE=
fi
+
+
+
+
+#
+# Check availablity of gtest, which might be used for unit tests.
+#
+
+# Check whether --with-gtest was given.
+if test "${with_gtest+set}" = set; then :
+ withval=$with_gtest; gtest_path="$withval"
+else
+ gtest_path="no"
+fi
+
+if test "$gtest_path" != "no"
+then
+ GTEST_INCLUDES="-I${gtest_path}/include"
+ GTEST_LDFLAGS="-L${gtest_path}/lib"
+ GTEST_LDADD="-lgtest"
+else
+ GTEST_INCLUDES=
+ GTEST_LDFLAGS=
+ GTEST_LDADD=
+fi
+ if test $gtest_path != "no"; then
+ HAVE_GTEST_TRUE=
+ HAVE_GTEST_FALSE='#'
+else
+ HAVE_GTEST_TRUE='#'
+ HAVE_GTEST_FALSE=
+fi
+
@@ -4715,6 +4758,10 @@
fi
if test -z "${HAVE_CXXTEST_TRUE}" && test -z "${HAVE_CXXTEST_FALSE}"; then
as_fn_error "conditional \"HAVE_CXXTEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_GTEST_TRUE}" && test -z "${HAVE_GTEST_FALSE}"; then
+ as_fn_error "conditional \"HAVE_GTEST\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
Modified: branches/jinmei-cppunittests/configure.ac
==============================================================================
--- branches/jinmei-cppunittests/configure.ac (original)
+++ branches/jinmei-cppunittests/configure.ac Tue Oct 20 00:58:20 2009
@@ -44,6 +44,9 @@
AC_SUBST(CPPUNIT_LDFLAGS)
AC_SUBST(CPPUNIT_LDADD)
+#
+# Check availablity of CxxUnit, which may be used for unit tests.
+#
AC_ARG_WITH(cxxtest,
[ --with-cxxtest=PATH specify a path to CxxTest script (PATH/cxxtestgen.pl) and header files (PATH/cxxtest/)],
cxxtest_path="$withval", cxxtest_path="no")
@@ -58,6 +61,27 @@
AC_SUBST(CXXTEST_PATH)
AC_SUBST(CXXTEST_INCLUDES)
+#
+# Check availablity of gtest, which might be used for unit tests.
+#
+AC_ARG_WITH(gtest,
+[ --with-gtest=PATH specify a path to Gtest header files (PATH/include) and library (PATH/lib)],
+ gtest_path="$withval", gtest_path="no")
+if test "$gtest_path" != "no"
+then
+ GTEST_INCLUDES="-I${gtest_path}/include"
+ GTEST_LDFLAGS="-L${gtest_path}/lib"
+ GTEST_LDADD="-lgtest"
+else
+ GTEST_INCLUDES=
+ GTEST_LDFLAGS=
+ GTEST_LDADD=
+fi
+AM_CONDITIONAL(HAVE_GTEST, test $gtest_path != "no")
+AC_SUBST(GTEST_INCLUDES)
+AC_SUBST(GTEST_LDFLAGS)
+AC_SUBST(GTEST_LDADD)
+
# Checks for library functions.
AC_CONFIG_FILES([Makefile
Modified: branches/jinmei-cppunittests/src/Makefile.in
==============================================================================
--- branches/jinmei-cppunittests/src/Makefile.in (original)
+++ branches/jinmei-cppunittests/src/Makefile.in Tue Oct 20 00:58:20 2009
@@ -112,6 +112,9 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
+GTEST_INCLUDES = @GTEST_INCLUDES@
+GTEST_LDADD = @GTEST_LDADD@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
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 00:58:20 2009
@@ -112,6 +112,9 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
+GTEST_INCLUDES = @GTEST_INCLUDES@
+GTEST_LDADD = @GTEST_LDADD@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
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 00:58:20 2009
@@ -3,26 +3,33 @@
lib_LIBRARIES = libdns.a
libdns_a_SOURCES = name.cc name.h
+TESTS =
+
if HAVE_CPPUNIT
-TEST_PROGRAM = run_unittests
+TESTS += run_unittests
run_unittests_SOURCES = name_unittest.cc name_unittest.h run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_INCLUDES)
run_unittests_LDFLAGS = $(CPPUNIT_LDFLAGS)
run_unittests_LDADD = ./libdns.a $(CPPUNIT_LDADD)
-else
+endif
+
if HAVE_CXXTEST
-TEST_PROGRAM = run_unittests
-run_unittests_SOURCES = name_cxxtest.cc
+TESTS += run_cxxtests
+run_cxxtests_SOURCES = name_cxxtest.cc
CLEANFILES = name_cxxtest.cc
-run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(CXXTEST_INCLUDES)
-run_unittests_LDADD = ./libdns.a
+run_cxxtests_CPPFLAGS = $(AM_CPPFLAGS) $(CXXTEST_INCLUDES)
+run_cxxtests_LDADD = ./libdns.a
name_cxxtest.cc: name_cxxtest.h
$(PERL) $(CXXTEST_PATH)/cxxtestgen.pl --error-printer -o $@ name_cxxtest.h
-else
-TEST_PROGRAM =
-endif
endif
-TESTS = $(TEST_PROGRAM)
-noinst_PROGRAMS = $(TEST_PROGRAM)
+if HAVE_GTEST
+TESTS += run_gtests
+run_gtests_SOURCES = name_gtest.cc
+run_gtests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_gtests_LDFLAGS = $(GTEST_LDFLAGS)
+run_gtests_LDADD = ./libdns.a $(GTEST_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 00:58:20 2009
@@ -33,8 +33,11 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-TESTS = $(am__EXEEXT_1)
-noinst_PROGRAMS = $(am__EXEEXT_1)
+TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+ at HAVE_CPPUNIT_TRUE@am__append_1 = run_unittests
+ at HAVE_CXXTEST_TRUE@am__append_2 = run_cxxtests
+ at HAVE_GTEST_TRUE@am__append_3 = run_gtests
+noinst_PROGRAMS = $(am__EXEEXT_4)
subdir = src/lib/dns
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -74,20 +77,31 @@
libdns_a_LIBADD =
am_libdns_a_OBJECTS = name.$(OBJEXT)
libdns_a_OBJECTS = $(am_libdns_a_OBJECTS)
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at am__EXEEXT_1 = \
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE@ run_unittests$(EXEEXT)
@HAVE_CPPUNIT_TRUE at am__EXEEXT_1 = run_unittests$(EXEEXT)
+ at HAVE_CXXTEST_TRUE@am__EXEEXT_2 = run_cxxtests$(EXEEXT)
+ at HAVE_GTEST_TRUE@am__EXEEXT_3 = run_gtests$(EXEEXT)
+am__EXEEXT_4 = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
PROGRAMS = $(noinst_PROGRAMS)
-am__run_unittests_SOURCES_DIST = name_cxxtest.cc name_unittest.cc \
- name_unittest.h run_unittests.cc
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at am_run_unittests_OBJECTS = run_unittests-name_cxxtest.$(OBJEXT)
+am__run_cxxtests_SOURCES_DIST = name_cxxtest.cc
+ at HAVE_CXXTEST_TRUE@am_run_cxxtests_OBJECTS = \
+ at HAVE_CXXTEST_TRUE@ run_cxxtests-name_cxxtest.$(OBJEXT)
+run_cxxtests_OBJECTS = $(am_run_cxxtests_OBJECTS)
+ at HAVE_CXXTEST_TRUE@run_cxxtests_DEPENDENCIES = ./libdns.a
+am__run_gtests_SOURCES_DIST = name_gtest.cc
+ at HAVE_GTEST_TRUE@am_run_gtests_OBJECTS = \
+ at HAVE_GTEST_TRUE@ run_gtests-name_gtest.$(OBJEXT)
+run_gtests_OBJECTS = $(am_run_gtests_OBJECTS)
+am__DEPENDENCIES_1 =
+ at HAVE_GTEST_TRUE@run_gtests_DEPENDENCIES = ./libdns.a \
+ at HAVE_GTEST_TRUE@ $(am__DEPENDENCIES_1)
+run_gtests_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(run_gtests_LDFLAGS) $(LDFLAGS) -o $@
+am__run_unittests_SOURCES_DIST = name_unittest.cc name_unittest.h \
+ run_unittests.cc
@HAVE_CPPUNIT_TRUE at am_run_unittests_OBJECTS = \
@HAVE_CPPUNIT_TRUE@ run_unittests-name_unittest.$(OBJEXT) \
@HAVE_CPPUNIT_TRUE@ run_unittests-run_unittests.$(OBJEXT)
run_unittests_OBJECTS = $(am_run_unittests_OBJECTS)
-am__DEPENDENCIES_1 =
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at run_unittests_DEPENDENCIES = \
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE@ ./libdns.a
@HAVE_CPPUNIT_TRUE at run_unittests_DEPENDENCIES = ./libdns.a \
@HAVE_CPPUNIT_TRUE@ $(am__DEPENDENCIES_1)
run_unittests_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -105,8 +119,11 @@
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libdns_a_SOURCES) $(run_unittests_SOURCES)
-DIST_SOURCES = $(libdns_a_SOURCES) $(am__run_unittests_SOURCES_DIST)
+SOURCES = $(libdns_a_SOURCES) $(run_cxxtests_SOURCES) \
+ $(run_gtests_SOURCES) $(run_unittests_SOURCES)
+DIST_SOURCES = $(libdns_a_SOURCES) $(am__run_cxxtests_SOURCES_DIST) \
+ $(am__run_gtests_SOURCES_DIST) \
+ $(am__run_unittests_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
@@ -140,6 +157,9 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
+GTEST_INCLUDES = @GTEST_INCLUDES@
+GTEST_LDADD = @GTEST_LDADD@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -212,17 +232,18 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/lib
lib_LIBRARIES = libdns.a
libdns_a_SOURCES = name.cc name.h
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_FALSE at TEST_PROGRAM =
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at TEST_PROGRAM = run_unittests
- at HAVE_CPPUNIT_TRUE@TEST_PROGRAM = run_unittests
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at run_unittests_SOURCES = name_cxxtest.cc
@HAVE_CPPUNIT_TRUE at run_unittests_SOURCES = name_unittest.cc name_unittest.h run_unittests.cc
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(CXXTEST_INCLUDES)
@HAVE_CPPUNIT_TRUE at run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_INCLUDES)
@HAVE_CPPUNIT_TRUE at run_unittests_LDFLAGS = $(CPPUNIT_LDFLAGS)
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at run_unittests_LDADD = ./libdns.a
@HAVE_CPPUNIT_TRUE at run_unittests_LDADD = ./libdns.a $(CPPUNIT_LDADD)
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at CLEANFILES = name_cxxtest.cc
+ at HAVE_CXXTEST_TRUE@run_cxxtests_SOURCES = name_cxxtest.cc
+ at HAVE_CXXTEST_TRUE@CLEANFILES = name_cxxtest.cc
+ at HAVE_CXXTEST_TRUE@run_cxxtests_CPPFLAGS = $(AM_CPPFLAGS) $(CXXTEST_INCLUDES)
+ at HAVE_CXXTEST_TRUE@run_cxxtests_LDADD = ./libdns.a
+ at HAVE_GTEST_TRUE@run_gtests_SOURCES = name_gtest.cc
+ at HAVE_GTEST_TRUE@run_gtests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+ at HAVE_GTEST_TRUE@run_gtests_LDFLAGS = $(GTEST_LDFLAGS)
+ at HAVE_GTEST_TRUE@run_gtests_LDADD = ./libdns.a $(GTEST_LDADD)
all: all-am
.SUFFIXES:
@@ -296,6 +317,12 @@
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+run_cxxtests$(EXEEXT): $(run_cxxtests_OBJECTS) $(run_cxxtests_DEPENDENCIES)
+ @rm -f run_cxxtests$(EXEEXT)
+ $(CXXLINK) $(run_cxxtests_OBJECTS) $(run_cxxtests_LDADD) $(LIBS)
+run_gtests$(EXEEXT): $(run_gtests_OBJECTS) $(run_gtests_DEPENDENCIES)
+ @rm -f run_gtests$(EXEEXT)
+ $(run_gtests_LINK) $(run_gtests_OBJECTS) $(run_gtests_LDADD) $(LIBS)
run_unittests$(EXEEXT): $(run_unittests_OBJECTS) $(run_unittests_DEPENDENCIES)
@rm -f run_unittests$(EXEEXT)
$(run_unittests_LINK) $(run_unittests_OBJECTS) $(run_unittests_LDADD) $(LIBS)
@@ -307,7 +334,8 @@
-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_unittests-name_cxxtest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_cxxtests-name_cxxtest.Po at am__quote@
+ at 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@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/run_unittests-run_unittests.Po at am__quote@
@@ -325,19 +353,33 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-run_unittests-name_cxxtest.o: name_cxxtest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_unittests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_unittests-name_cxxtest.o -MD -MP -MF $(DEPDIR)/run_unittests-name_cxxtest.Tpo -c -o run_unittests-name_cxxtest.o `test -f 'name_cxxtest.cc' || echo '$(srcdir)/'`name_cxxtest.cc
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_unittests-name_cxxtest.Tpo $(DEPDIR)/run_unittests-name_cxxtest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_cxxtest.cc' object='run_unittests-name_cxxtest.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_unittests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_unittests-name_cxxtest.o `test -f 'name_cxxtest.cc' || echo '$(srcdir)/'`name_cxxtest.cc
-
-run_unittests-name_cxxtest.obj: name_cxxtest.cc
- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_unittests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_unittests-name_cxxtest.obj -MD -MP -MF $(DEPDIR)/run_unittests-name_cxxtest.Tpo -c -o run_unittests-name_cxxtest.obj `if test -f 'name_cxxtest.cc'; then $(CYGPATH_W) 'name_cxxtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_cxxtest.cc'; fi`
- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_unittests-name_cxxtest.Tpo $(DEPDIR)/run_unittests-name_cxxtest.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_cxxtest.cc' object='run_unittests-name_cxxtest.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_unittests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_unittests-name_cxxtest.obj `if test -f 'name_cxxtest.cc'; then $(CYGPATH_W) 'name_cxxtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_cxxtest.cc'; fi`
+run_cxxtests-name_cxxtest.o: name_cxxtest.cc
+ at 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
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_cxxtests-name_cxxtest.Tpo $(DEPDIR)/run_cxxtests-name_cxxtest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_cxxtest.cc' object='run_cxxtests-name_cxxtest.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_cxxtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_cxxtests-name_cxxtest.o `test -f 'name_cxxtest.cc' || echo '$(srcdir)/'`name_cxxtest.cc
+
+run_cxxtests-name_cxxtest.obj: name_cxxtest.cc
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_cxxtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_cxxtests-name_cxxtest.obj -MD -MP -MF $(DEPDIR)/run_cxxtests-name_cxxtest.Tpo -c -o run_cxxtests-name_cxxtest.obj `if test -f 'name_cxxtest.cc'; then $(CYGPATH_W) 'name_cxxtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_cxxtest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_cxxtests-name_cxxtest.Tpo $(DEPDIR)/run_cxxtests-name_cxxtest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_cxxtest.cc' object='run_cxxtests-name_cxxtest.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_cxxtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_cxxtests-name_cxxtest.obj `if test -f 'name_cxxtest.cc'; then $(CYGPATH_W) 'name_cxxtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_cxxtest.cc'; fi`
+
+run_gtests-name_gtest.o: name_gtest.cc
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_gtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_gtests-name_gtest.o -MD -MP -MF $(DEPDIR)/run_gtests-name_gtest.Tpo -c -o run_gtests-name_gtest.o `test -f 'name_gtest.cc' || echo '$(srcdir)/'`name_gtest.cc
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_gtests-name_gtest.Tpo $(DEPDIR)/run_gtests-name_gtest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_gtest.cc' object='run_gtests-name_gtest.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_gtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_gtests-name_gtest.o `test -f 'name_gtest.cc' || echo '$(srcdir)/'`name_gtest.cc
+
+run_gtests-name_gtest.obj: name_gtest.cc
+ at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_gtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_gtests-name_gtest.obj -MD -MP -MF $(DEPDIR)/run_gtests-name_gtest.Tpo -c -o run_gtests-name_gtest.obj `if test -f 'name_gtest.cc'; then $(CYGPATH_W) 'name_gtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_gtest.cc'; fi`
+ at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/run_gtests-name_gtest.Tpo $(DEPDIR)/run_gtests-name_gtest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='name_gtest.cc' object='run_gtests-name_gtest.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_gtests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o run_gtests-name_gtest.obj `if test -f 'name_gtest.cc'; then $(CYGPATH_W) 'name_gtest.cc'; else $(CYGPATH_W) '$(srcdir)/name_gtest.cc'; fi`
run_unittests-name_unittest.o: name_unittest.cc
@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(run_unittests_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT run_unittests-name_unittest.o -MD -MP -MF $(DEPDIR)/run_unittests-name_unittest.Tpo -c -o run_unittests-name_unittest.o `test -f 'name_unittest.cc' || echo '$(srcdir)/'`name_unittest.cc
@@ -662,8 +704,8 @@
uninstall-am uninstall-libLIBRARIES
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE at name_cxxtest.cc: name_cxxtest.h
- at HAVE_CPPUNIT_FALSE@@HAVE_CXXTEST_TRUE@ $(PERL) $(CXXTEST_PATH)/cxxtestgen.pl --error-printer -o $@ name_cxxtest.h
+ at HAVE_CXXTEST_TRUE@name_cxxtest.cc: name_cxxtest.h
+ at HAVE_CXXTEST_TRUE@ $(PERL) $(CXXTEST_PATH)/cxxtestgen.pl --error-printer -o $@ name_cxxtest.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: branches/jinmei-cppunittests/src/lib/dns/name_cxxtest.h
==============================================================================
--- branches/jinmei-cppunittests/src/lib/dns/name_cxxtest.h (original)
+++ branches/jinmei-cppunittests/src/lib/dns/name_cxxtest.h Tue Oct 20 00:58:20 2009
@@ -24,6 +24,7 @@
class NameTest : public CxxTest::TestSuite {
public:
+ // test functions must begin with test or Test
void test_get_length()
{
Name name("www.example.com");
More information about the bind10-changes
mailing list