Commit 65827263 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

moved unit test related files to tests/ as we agreed in the f2f week.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/jinmei-dnsrdata2@742 e5f2f494-b856-4b98-b285-d166d9295462
parent 7618c5a3
...@@ -163,6 +163,7 @@ AC_CONFIG_FILES([Makefile ...@@ -163,6 +163,7 @@ AC_CONFIG_FILES([Makefile
src/lib/config/python/isc/config/Makefile src/lib/config/python/isc/config/Makefile
src/lib/dns/Makefile src/lib/dns/Makefile
src/lib/dns/cpp/Makefile src/lib/dns/cpp/Makefile
src/lib/dns/cpp/tests/Makefile
src/lib/exceptions/cpp/Makefile src/lib/exceptions/cpp/Makefile
src/lib/exceptions/Makefile src/lib/exceptions/Makefile
src/lib/auth/Makefile src/lib/auth/Makefile
......
SUBDIRS = cpp SUBDIRS = cpp cpp/tests
...@@ -22,26 +22,4 @@ rrtype.h: rrtype-placeholder.h ...@@ -22,26 +22,4 @@ rrtype.h: rrtype-placeholder.h
rrparamregistry.cc: rrparamregistry-placeholder.cc rrparamregistry.cc: rrparamregistry-placeholder.cc
rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: Makefile rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: Makefile
./gen-rdatacode.py ./gen-rdatacode.py
tests: libdns.la
TESTS =
if HAVE_GTEST
TESTS += run_unittests
run_unittests_SOURCES = unittest_util.h unittest_util.cc
run_unittests_SOURCES += buffer_unittest.cc name_unittest.cc
run_unittests_SOURCES += messagerenderer_unittest.cc
run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
run_unittests_SOURCES += rrttl_unittest.cc
run_unittests_SOURCES += rdata_unittest.cc
run_unittests_SOURCES += rrset_unittest.cc
run_unittests_SOURCES += question_unittest.cc
run_unittests_SOURCES += rrparamregistry_unittest.cc
run_unittests_SOURCES += message_unittest.cc
run_unittests_SOURCES += base64_unittest.cc
run_unittests_SOURCES += run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = .libs/libdns.a $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
endif
noinst_PROGRAMS = $(TESTS)
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "base64.h" #include <dns/base64.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// $Id$ // $Id$
#include "buffer.h" #include <dns/buffer.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
// $Id$ // $Id$
#include "buffer.h" #include <dns/buffer.h>
#include "message.h" #include <dns/message.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "question.h" #include <dns/question.h>
#include "rdataclass.h" #include <dns/rdataclass.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "rrttl.h" #include <dns/rrttl.h>
#include "rrtype.h" #include <dns/rrtype.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <vector> #include <vector>
#include "buffer.h" #include <dns/buffer.h>
#include "name.h" #include <dns/name.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "unittest_util.h" #include "unittest_util.h"
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include <iomanip> #include <iomanip>
#include <stdexcept> #include <stdexcept>
#include "buffer.h" #include <dns/buffer.h>
#include "name.h" #include <dns/name.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "unittest_util.h" #include "unittest_util.h"
......
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
// $Id$ // $Id$
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "name.h" #include <dns/name.h>
#include "question.h" #include <dns/question.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "rrtype.h" #include <dns/rrtype.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
#include <vector> #include <vector>
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "rdata.h" #include <dns/rdata.h>
#include "rdataclass.h" #include <dns/rdataclass.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "rrtype.h" #include <dns/rrtype.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "unittest_util.h" #include "unittest_util.h"
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "rrparamregistry.h" #include <dns/rrparamregistry.h>
#include "rrtype.h" #include <dns/rrtype.h>
using namespace std; using namespace std;
using namespace isc::dns; using namespace isc::dns;
......
...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
// $Id$ // $Id$
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "name.h" #include <dns/name.h>
#include "rdata.h" #include <dns/rdata.h>
#include "rdataclass.h" #include <dns/rdataclass.h>
#include "rrclass.h" #include <dns/rrclass.h>
#include "rrtype.h" #include <dns/rrtype.h>
#include "rrttl.h" #include <dns/rrttl.h>
#include "rrset.h" #include <dns/rrset.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "rrttl.h" #include <dns/rrttl.h>
#include "unittest_util.h" #include "unittest_util.h"
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "buffer.h" #include <dns/buffer.h>
#include "messagerenderer.h" #include <dns/messagerenderer.h>
#include "rrtype.h" #include <dns/rrtype.h>
#include "unittest_util.h" #include "unittest_util.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment