[svn] commit: r1762 - in /trunk: ./ src/bin/bind10/ src/bin/bind10/tests/ src/bin/bindctl/ src/bin/bindctl/tests/ src/bin/cmdctl/ src/bin/cmdctl/tests/ src/bin/msgq/ src/bin/msgq/tests/ src/bin/xfrin/ src/bin/xfrin/tests/ src/bin/xfrout/ src/bin/xfrout/tests/ src/lib/cc/ src/lib/dns/ src/lib/dns/rdata/generic/ src/lib/dns/tests/ src/lib/python/isc/cc/ src/lib/python/isc/cc/tests/ src/lib/python/isc/config/ src/lib/python/isc/config/tests/

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Apr 21 00:49:43 UTC 2010 

Author: jreed
Date: Wed Apr 21 00:49:42 2010
New Revision: 1762

Log:
Merge from trac153 for ticket #153.

This was also tested by jinmei and and older version by shane and jelte.
A couple Makefile.am's were looked at. There was not a thorough review
of this.

Moved msgq tests to own directory.

Added targets for all known python unittests.
Note this is for those that use the unittest module.
Other tests are ignored for now.

These tests are ran using "make check" even if not built
with gtest.

Some tests are disabled, tickets opened to track the problems.

Added:
    trunk/src/bin/bind10/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/bin/bind10/tests/Makefile.am
    trunk/src/bin/bindctl/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/bin/bindctl/tests/Makefile.am
    trunk/src/bin/cmdctl/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/bin/cmdctl/tests/Makefile.am
    trunk/src/bin/msgq/tests/
      - copied from r1761, branches/trac153/src/bin/msgq/tests/
    trunk/src/bin/xfrin/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/bin/xfrin/tests/Makefile.am
    trunk/src/bin/xfrout/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/bin/xfrout/tests/Makefile.am
    trunk/src/lib/python/isc/cc/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/lib/python/isc/cc/tests/Makefile.am
    trunk/src/lib/python/isc/config/tests/Makefile.am
      - copied unchanged from r1761, branches/trac153/src/lib/python/isc/config/tests/Makefile.am
Removed:
    trunk/src/bin/msgq/msgq_test.in
    trunk/src/bin/msgq/msgq_test.py
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/src/bin/bind10/Makefile.am
    trunk/src/bin/bindctl/Makefile.am
    trunk/src/bin/cmdctl/Makefile.am
    trunk/src/bin/msgq/Makefile.am
    trunk/src/bin/xfrin/Makefile.am
    trunk/src/bin/xfrout/Makefile.am
    trunk/src/lib/cc/   (props changed)
    trunk/src/lib/dns/   (props changed)
    trunk/src/lib/dns/rdata/generic/rrsig_46.cc   (props changed)
    trunk/src/lib/dns/tests/   (props changed)
    trunk/src/lib/python/isc/cc/Makefile.am
    trunk/src/lib/python/isc/config/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Apr 21 00:49:42 2010
@@ -361,16 +361,22 @@
                  src/Makefile
                  src/bin/Makefile
                  src/bin/bind10/Makefile
+                 src/bin/bind10/tests/Makefile
                  src/bin/cmdctl/Makefile
+                 src/bin/cmdctl/tests/Makefile
                  src/bin/bindctl/Makefile
+                 src/bin/bindctl/tests/Makefile
                  src/bin/cfgmgr/Makefile
                  src/bin/host/Makefile
                  src/bin/loadzone/Makefile
                  src/bin/msgq/Makefile
+                 src/bin/msgq/tests/Makefile
                  src/bin/auth/Makefile
                  src/bin/auth/tests/Makefile
                  src/bin/xfrin/Makefile
+                 src/bin/xfrin/tests/Makefile
                  src/bin/xfrout/Makefile
+                 src/bin/xfrout/tests/Makefile
                  src/bin/usermgr/Makefile
                  src/lib/Makefile
                  src/lib/cc/Makefile
@@ -378,7 +384,9 @@
                  src/lib/python/isc/Makefile
                  src/lib/python/isc/auth/Makefile
                  src/lib/python/isc/cc/Makefile
+                 src/lib/python/isc/cc/tests/Makefile
                  src/lib/python/isc/config/Makefile
+                 src/lib/python/isc/config/tests/Makefile
                  src/lib/config/Makefile
                  src/lib/config/tests/Makefile
                  src/lib/dns/Makefile
@@ -411,7 +419,7 @@
            src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            src/bin/usermgr/b10-cmdctl-usermgr.py
            src/bin/msgq/msgq.py
-           src/bin/msgq/msgq_test
+           src/bin/msgq/tests/msgq_test
            src/bin/msgq/run_msgq.sh
            src/bin/auth/auth.spec.pre
            src/bin/auth/spec_config.h
@@ -433,7 +441,7 @@
            chmod +x src/bin/loadzone/run_loadzone.sh
            chmod +x src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            chmod +x src/bin/msgq/run_msgq.sh
-           chmod +x src/bin/msgq/msgq_test
+           chmod +x src/bin/msgq/tests/msgq_test
            chmod +x src/lib/dns/gen-rdatacode.py
            chmod +x src/lib/dns/tests/testdata/gen-wiredata.py
           ])

Modified: trunk/src/bin/bind10/Makefile.am
==============================================================================
--- trunk/src/bin/bind10/Makefile.am (original)
+++ trunk/src/bin/bind10/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,5 +1,7 @@
+SUBDIRS = tests
+
 sbin_SCRIPTS = bind10
-CLEANFILES = bind10
+CLEANFILES = bind10 bind10.pyc
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
@@ -8,7 +10,7 @@
 EXTRA_DIST = bob.spec
 
 man_MANS = bind10.8
-EXTRA_DIST += $(man_MANS) bind10.xml tests/bind10_test.py
+EXTRA_DIST += $(man_MANS) bind10.xml
 
 if ENABLE_MAN
 

Modified: trunk/src/bin/bindctl/Makefile.am
==============================================================================
--- trunk/src/bin/bindctl/Makefile.am (original)
+++ trunk/src/bin/bindctl/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 bin_SCRIPTS = bindctl
 man_MANS = bindctl.1
 
@@ -9,7 +11,6 @@
 bindctldir = $(DESTDIR)$(pkgdatadir)
 bindctl_DATA = bindctl.pem
 EXTRA_DIST += bindctl.pem
-EXTRA_DIST += tests/bindctl_test.py
 
 CLEANFILES = bindctl
 

Modified: trunk/src/bin/cmdctl/Makefile.am
==============================================================================
--- trunk/src/bin/cmdctl/Makefile.am (original)
+++ trunk/src/bin/cmdctl/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-cmdctl
@@ -16,7 +18,6 @@
  
 EXTRA_DIST = $(CMDCTL_CONFIGURATIONS)
 EXTRA_DIST += cmdctl.spec
-EXTRA_DIST += tests/cmdctl_test.py
 
 CLEANFILES=	b10-cmdctl
 

Modified: trunk/src/bin/msgq/Makefile.am
==============================================================================
--- trunk/src/bin/msgq/Makefile.am (original)
+++ trunk/src/bin/msgq/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,11 +1,13 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
  
 pkglibexec_SCRIPTS = b10-msgq
 
-CLEANFILES = b10-msgq
+CLEANFILES = b10-msgq msgq.pyc
 
 man_MANS = b10-msgq.8
-EXTRA_DIST = $(man_MANS) msgq.xml msgq_test.py
+EXTRA_DIST = $(man_MANS) msgq.xml
 
 if ENABLE_MAN
 

Modified: trunk/src/bin/xfrin/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/Makefile.am (original)
+++ trunk/src/bin/xfrin/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-xfrin
@@ -5,11 +7,10 @@
 b10_xfrindir = $(DESTDIR)$(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
-CLEANFILES = b10-xfrin xfrin.spec
+CLEANFILES = b10-xfrin xfrin.pyc xfrin.spec
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
-EXTRA_DIST += tests/xfrin_test.py
 
 if ENABLE_MAN
 

Modified: trunk/src/bin/xfrout/Makefile.am
==============================================================================
--- trunk/src/bin/xfrout/Makefile.am (original)
+++ trunk/src/bin/xfrout/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-xfrout
@@ -5,9 +7,7 @@
 b10_xfroutdir = $(DESTDIR)$(pkgdatadir)
 b10_xfrout_DATA = xfrout.spec
 
-CLEANFILES=	b10-xfrout xfrout.spec
-
-EXTRA_DIST = tests/xfrout_test.py
+CLEANFILES=	b10-xfrout xfrout.pyc xfrout.spec
 
 xfrout.spec: xfrout.spec.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.spec.pre >$@

Modified: trunk/src/lib/python/isc/cc/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/cc/Makefile.am (original)
+++ trunk/src/lib/python/isc/cc/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,9 +1,5 @@
+SUBDIRS = tests
+
 python_PYTHON =	__init__.py data.py session.py message.py
 
 pythondir = $(pyexecdir)/isc/cc
-
-EXTRA_DIST =  tests/data_test.py
-EXTRA_DIST += tests/sendcmd.py
-EXTRA_DIST += tests/session_test.py
-EXTRA_DIST += tests/test.py
-EXTRA_DIST += tests/test_session.py

Modified: trunk/src/lib/python/isc/config/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/config/Makefile.am (original)
+++ trunk/src/lib/python/isc/config/Makefile.am Wed Apr 21 00:49:42 2010
@@ -1,9 +1,5 @@
+SUBDIRS = tests
+
 python_PYTHON = __init__.py ccsession.py cfgmgr.py config_data.py module_spec.py
 
 pythondir = $(pyexecdir)/isc/config
-
-EXTRA_DIST = tests/ccsession_test.py
-EXTRA_DIST += tests/cfgmgr_test.py
-EXTRA_DIST += tests/config_data_test.py
-EXTRA_DIST += tests/module_spec_test.py
-EXTRA_DIST += tests/unittest_fakesession.py

More information about the bind10-changes mailing list