[svn] commit: r323 - in /trunk: Makefile.in configure.ac src/Makefile.in src/lib/Makefile.in src/lib/dns/cpp/Makefile.am src/lib/dns/cpp/name_unittest.cc src/lib/dns/cpp/name_unittest.h src/lib/dns/cpp/run_unittests.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 23 21:50:59 UTC 2009
Author: jinmei
Date: Mon Nov 23 21:50:59 2009
New Revision: 323
Log:
adopted gtest for unittest framework
Removed:
trunk/src/lib/dns/cpp/name_unittest.cc
trunk/src/lib/dns/cpp/name_unittest.h
Modified:
trunk/Makefile.in
trunk/configure.ac
trunk/src/Makefile.in
trunk/src/lib/Makefile.in
trunk/src/lib/dns/cpp/Makefile.am
trunk/src/lib/dns/cpp/run_unittests.cc
Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in (original)
+++ trunk/Makefile.in Mon Nov 23 21:50:59 2009
@@ -110,9 +110,6 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
-CPPUNIT_LDADD = @CPPUNIT_LDADD@
-CPPUNIT_LDFLAGS = @CPPUNIT_LDFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
@@ -125,6 +122,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: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Nov 23 21:50:59 2009
@@ -21,25 +21,25 @@
AC_TYPE_SIZE_T
#
-# Check availablity of CppUnit, which will be used for unit tests.
+# Check availablity of gtest, which will be used for unit tests.
#
-AC_ARG_WITH(cppunit,
-[ --with-cppunit=PATH specify a path to CppUnit header files (PATH/include) and library (PATH/lib)],
- cppunit_path="$withval", cppunit_path="no")
-if test "$cppunit_path" != "no"
+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
- CPPUNIT_INCLUDES="-I${cppunit_path}/include"
- CPPUNIT_LDFLAGS="-L${cppunit_path}/lib"
- CPPUNIT_LDADD="-lcppunit"
+ GTEST_INCLUDES="-I${gtest_path}/include"
+ GTEST_LDFLAGS="-L${gtest_path}/lib"
+ GTEST_LDADD="-lgtest"
else
- CPPUNIT_INCLUDES=
- CPPUNIT_LDFLAGS=
- CPPUNIT_LDADD=
+ GTEST_INCLUDES=
+ GTEST_LDFLAGS=
+ GTEST_LDADD=
fi
-AM_CONDITIONAL(HAVE_CPPUNIT, test $cppunit_path != "no")
-AC_SUBST(CPPUNIT_INCLUDES)
-AC_SUBST(CPPUNIT_LDFLAGS)
-AC_SUBST(CPPUNIT_LDADD)
+AM_CONDITIONAL(HAVE_GTEST, test $gtest_path != "no")
+AC_SUBST(GTEST_INCLUDES)
+AC_SUBST(GTEST_LDFLAGS)
+AC_SUBST(GTEST_LDADD)
# Checks for library functions.
Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in (original)
+++ trunk/src/Makefile.in Mon Nov 23 21:50:59 2009
@@ -95,9 +95,6 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
-CPPUNIT_LDADD = @CPPUNIT_LDADD@
-CPPUNIT_LDFLAGS = @CPPUNIT_LDFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
@@ -110,6 +107,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: trunk/src/lib/Makefile.in
==============================================================================
--- trunk/src/lib/Makefile.in (original)
+++ trunk/src/lib/Makefile.in Mon Nov 23 21:50:59 2009
@@ -95,9 +95,6 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@
-CPPUNIT_LDADD = @CPPUNIT_LDADD@
-CPPUNIT_LDFLAGS = @CPPUNIT_LDFLAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
@@ -110,6 +107,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: trunk/src/lib/dns/cpp/Makefile.am
==============================================================================
--- trunk/src/lib/dns/cpp/Makefile.am (original)
+++ trunk/src/lib/dns/cpp/Makefile.am Mon Nov 23 21:50:59 2009
@@ -1,15 +1,13 @@
lib_LIBRARIES = libdns.a
libdns_a_SOURCES = name.cc name.h
-if HAVE_CPPUNIT
-TEST_PROGRAM = run_unittests
-else
-TEST_PROGRAM =
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = run_unittests.cc
+run_unittests_CPPFLAGS = $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
+run_unittests_LDADD = ./libdns.a $(GTEST_LDADD)
endif
-TESTS = $(TEST_PROGRAM)
-noinst_PROGRAMS = $(TEST_PROGRAM)
-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)
+noinst_PROGRAMS = $(TESTS)
Modified: trunk/src/lib/dns/cpp/run_unittests.cc
==============================================================================
--- trunk/src/lib/dns/cpp/run_unittests.cc (original)
+++ trunk/src/lib/dns/cpp/run_unittests.cc Mon Nov 23 21:50:59 2009
@@ -14,49 +14,11 @@
// $Id$
-#include <iostream>
-#include <stdexcept>
-
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/TestCase.h>
-#include <cppunit/TestResult.h>
-#include <cppunit/TestResultCollector.h>
-#include <cppunit/TestRunner.h>
-#include <cppunit/TextTestProgressListener.h>
-
-#include "name_unittest.h"
+#include <gtest/gtest.h>
int
main(int argc, char* argv[])
{
- CppUnit::TestRunner runner;
- CppUnit::TestResult controller;
-
- // Add a listener that collects test result
- CppUnit::TestResultCollector result;
- controller.addListener( &result );
-
- // Add a listener that print dots as test run.
- CppUnit::TextTestProgressListener progress;
- controller.addListener(&progress);
-
- runner.addTest(NameTest::suite());
-
- try {
- std::cout << "Running ";
- runner.run(controller, "");
-
- std::cerr << std::endl;
-
- // Print test in a compiler compatible format.
- CppUnit::CompilerOutputter outputter(&result, std::cerr);
- outputter.write();
- } catch (std::invalid_argument& e) { // Test path not resolved
- std::cerr << std::endl
- << "ERROR: " << e.what()
- << std::endl;
- return 0;
- }
-
- return (result.wasSuccessful() ? 0 : 1);
+ ::testing::InitGoogleTest(&argc, argv);
+ return (RUN_ALL_TESTS());
}
More information about the bind10-changes
mailing list