[svn] commit: r3552 - in /branches/trac402: ./ src/bin/auth/tests/ src/bin/auth/tests/testdata/ src/bin/recurse/tests/ src/lib/ src/lib/testutils/ src/lib/testutils/testdata/

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Nov 17 16:52:37 UTC 2010 

Author: vorner
Date: Wed Nov 17 16:52:36 2010
New Revision: 3552

Log:
Move common tests to separate directory

Added:
    branches/trac402/src/lib/testutils/
    branches/trac402/src/lib/testutils/README
    branches/trac402/src/lib/testutils/mockups.h
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/mockups.h
    branches/trac402/src/lib/testutils/srv_test.h
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/srv_test.h
    branches/trac402/src/lib/testutils/srv_unittest.h
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/srv_unittest.h
    branches/trac402/src/lib/testutils/testdata/
    branches/trac402/src/lib/testutils/testdata/badExampleQuery_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/badExampleQuery_fromWire
    branches/trac402/src/lib/testutils/testdata/badExampleQuery_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/badExampleQuery_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/example.com
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/example.com
    branches/trac402/src/lib/testutils/testdata/example.sqlite3
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/example.sqlite3
    branches/trac402/src/lib/testutils/testdata/examplequery_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/examplequery_fromWire
    branches/trac402/src/lib/testutils/testdata/examplequery_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/examplequery_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/iqueryresponse_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/iqueryresponse_fromWire
    branches/trac402/src/lib/testutils/testdata/iqueryresponse_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/iqueryresponse_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/multiquestion_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/multiquestion_fromWire
    branches/trac402/src/lib/testutils/testdata/multiquestion_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/multiquestion_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/queryBadEDNS_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/queryBadEDNS_fromWire
    branches/trac402/src/lib/testutils/testdata/queryBadEDNS_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/queryBadEDNS_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/shortanswer_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/shortanswer_fromWire
    branches/trac402/src/lib/testutils/testdata/shortanswer_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/shortanswer_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/shortmessage_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/shortmessage_fromWire
    branches/trac402/src/lib/testutils/testdata/shortquestion_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/shortquestion_fromWire
    branches/trac402/src/lib/testutils/testdata/shortresponse_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/shortresponse_fromWire
    branches/trac402/src/lib/testutils/testdata/simplequery_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/simplequery_fromWire
    branches/trac402/src/lib/testutils/testdata/simplequery_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/simplequery_fromWire.spec
    branches/trac402/src/lib/testutils/testdata/simpleresponse_fromWire
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/simpleresponse_fromWire
    branches/trac402/src/lib/testutils/testdata/simpleresponse_fromWire.spec
      - copied, changed from r3551, branches/trac402/src/bin/auth/tests/testdata/simpleresponse_fromWire.spec
Removed:
    branches/trac402/src/bin/auth/tests/mockups.h
    branches/trac402/src/bin/auth/tests/srv_test.h
    branches/trac402/src/bin/auth/tests/srv_unittest.h
    branches/trac402/src/bin/auth/tests/testdata/badExampleQuery_fromWire
    branches/trac402/src/bin/auth/tests/testdata/badExampleQuery_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/example.com
    branches/trac402/src/bin/auth/tests/testdata/example.sqlite3
    branches/trac402/src/bin/auth/tests/testdata/examplequery_fromWire
    branches/trac402/src/bin/auth/tests/testdata/examplequery_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/iqueryresponse_fromWire
    branches/trac402/src/bin/auth/tests/testdata/iqueryresponse_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/multiquestion_fromWire
    branches/trac402/src/bin/auth/tests/testdata/multiquestion_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/queryBadEDNS_fromWire
    branches/trac402/src/bin/auth/tests/testdata/queryBadEDNS_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/shortanswer_fromWire
    branches/trac402/src/bin/auth/tests/testdata/shortanswer_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/shortmessage_fromWire
    branches/trac402/src/bin/auth/tests/testdata/shortquestion_fromWire
    branches/trac402/src/bin/auth/tests/testdata/shortresponse_fromWire
    branches/trac402/src/bin/auth/tests/testdata/simplequery_fromWire
    branches/trac402/src/bin/auth/tests/testdata/simplequery_fromWire.spec
    branches/trac402/src/bin/auth/tests/testdata/simpleresponse_fromWire
    branches/trac402/src/bin/auth/tests/testdata/simpleresponse_fromWire.spec
Modified:
    branches/trac402/configure.ac
    branches/trac402/src/bin/auth/tests/Makefile.am
    branches/trac402/src/bin/auth/tests/auth_srv_unittest.cc
    branches/trac402/src/bin/recurse/tests/Makefile.am
    branches/trac402/src/bin/recurse/tests/recursor_unittest.cc
    branches/trac402/src/lib/Makefile.am

Modified: branches/trac402/configure.ac
==============================================================================
--- branches/trac402/configure.ac (original)
+++ branches/trac402/configure.ac Wed Nov 17 16:52:36 2010
@@ -463,6 +463,7 @@
                  src/lib/datasrc/Makefile
                  src/lib/datasrc/tests/Makefile
                  src/lib/xfr/Makefile
+                 src/lib/testutils/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
            src/bin/cfgmgr/tests/b10-cfgmgr_test.py

Modified: branches/trac402/src/bin/auth/tests/Makefile.am
==============================================================================
--- branches/trac402/src/bin/auth/tests/Makefile.am (original)
+++ branches/trac402/src/bin/auth/tests/Makefile.am Wed Nov 17 16:52:36 2010
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
-AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/lib/testutils/testdata\"
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
@@ -20,8 +20,6 @@
 run_unittests_SOURCES += ../change_user.h ../change_user.cc
 run_unittests_SOURCES += auth_srv_unittest.cc
 run_unittests_SOURCES += change_user_unittest.cc
-run_unittests_SOURCES += srv_test.h
-run_unittests_SOURCES += srv_unittest.h
 run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
@@ -37,25 +35,3 @@
 endif
 
 noinst_PROGRAMS = $(TESTS)
-
-EXTRA_DIST =  testdata/badExampleQuery_fromWire
-EXTRA_DIST += testdata/badExampleQuery_fromWire.spec
-EXTRA_DIST += testdata/example.com
-EXTRA_DIST += testdata/examplequery_fromWire
-EXTRA_DIST += testdata/examplequery_fromWire.spec
-EXTRA_DIST += testdata/example.sqlite3
-EXTRA_DIST += testdata/iqueryresponse_fromWire
-EXTRA_DIST += testdata/iqueryresponse_fromWire.spec
-EXTRA_DIST += testdata/multiquestion_fromWire
-EXTRA_DIST += testdata/multiquestion_fromWire.spec
-EXTRA_DIST += testdata/queryBadEDNS_fromWire
-EXTRA_DIST += testdata/queryBadEDNS_fromWire.spec
-EXTRA_DIST += testdata/shortanswer_fromWire
-EXTRA_DIST += testdata/shortanswer_fromWire.spec
-EXTRA_DIST += testdata/shortmessage_fromWire
-EXTRA_DIST += testdata/shortquestion_fromWire
-EXTRA_DIST += testdata/shortresponse_fromWire
-EXTRA_DIST += testdata/simplequery_fromWire
-EXTRA_DIST += testdata/simplequery_fromWire.spec
-EXTRA_DIST += testdata/simpleresponse_fromWire
-EXTRA_DIST += testdata/simpleresponse_fromWire.spec

Modified: branches/trac402/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- branches/trac402/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ branches/trac402/src/bin/auth/tests/auth_srv_unittest.cc Wed Nov 17 16:52:36 2010
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <auth/auth_srv.h>
-#include <auth/tests/srv_unittest.h>
+#include <testutils/srv_unittest.h>
 
 using namespace std;
 using namespace isc::cc;

Modified: branches/trac402/src/bin/recurse/tests/Makefile.am
==============================================================================
--- branches/trac402/src/bin/recurse/tests/Makefile.am (original)
+++ branches/trac402/src/bin/recurse/tests/Makefile.am Wed Nov 17 16:52:36 2010
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
-AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/bin/auth/tests/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/lib/testutils/testdata\"
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
@@ -17,9 +17,6 @@
 run_unittests_SOURCES = $(top_srcdir)/src/lib/dns/tests/unittest_util.h
 run_unittests_SOURCES += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc
 run_unittests_SOURCES += ../recursor.h ../recursor.cc
-run_unittests_SOURCES += ../../auth/tests/mockups.h
-run_unittests_SOURCES += ../../auth/tests/srv_test.h
-run_unittests_SOURCES += ../../auth/tests/srv_unittest.h
 run_unittests_SOURCES += recursor_unittest.cc
 run_unittests_SOURCES += run_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)

Modified: branches/trac402/src/bin/recurse/tests/recursor_unittest.cc
==============================================================================
--- branches/trac402/src/bin/recurse/tests/recursor_unittest.cc (original)
+++ branches/trac402/src/bin/recurse/tests/recursor_unittest.cc Wed Nov 17 16:52:36 2010
@@ -16,7 +16,7 @@
 
 #include <config.h>
 #include <recurse/recursor.h>
-#include <auth/tests/srv_unittest.h>
+#include <testutils/srv_unittest.h>
 
 using isc::UnitTestUtil;
 using namespace std;

Modified: branches/trac402/src/lib/Makefile.am
==============================================================================
--- branches/trac402/src/lib/Makefile.am (original)
+++ branches/trac402/src/lib/Makefile.am Wed Nov 17 16:52:36 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench
+SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench testutils

More information about the bind10-changes mailing list