[svn] commit: r3104 - in /trunk: ./ src/lib/config/ src/lib/config/testdata/ src/lib/config/tests/ src/lib/config/tests/testdata/ src/lib/python/isc/config/tests/

BIND 10 source code commits bind10-changes at lists.isc.org
Sat Oct 2 06:45:45 UTC 2010 

Author: jinmei
Date: Sat Oct  2 06:45:45 2010
New Revision: 3104

Log:
merged trac #344: use the common path for test data in lib/config

Added:
    trunk/src/lib/config/tests/testdata/
      - copied from r3103, branches/trac344/src/lib/config/tests/testdata/
Removed:
    trunk/src/lib/config/testdata/Makefile.am
    trunk/src/lib/config/testdata/b10-config-bad1.db
    trunk/src/lib/config/testdata/b10-config-bad2.db
    trunk/src/lib/config/testdata/b10-config-bad3.db
    trunk/src/lib/config/testdata/b10-config-bad4.db
    trunk/src/lib/config/testdata/b10-config.db.master
    trunk/src/lib/config/testdata/data22_1.data
    trunk/src/lib/config/testdata/data22_2.data
    trunk/src/lib/config/testdata/data22_3.data
    trunk/src/lib/config/testdata/data22_4.data
    trunk/src/lib/config/testdata/data22_5.data
    trunk/src/lib/config/testdata/data22_6.data
    trunk/src/lib/config/testdata/data22_7.data
    trunk/src/lib/config/testdata/data22_8.data
    trunk/src/lib/config/testdata/spec1.spec
    trunk/src/lib/config/testdata/spec10.spec
    trunk/src/lib/config/testdata/spec11.spec
    trunk/src/lib/config/testdata/spec12.spec
    trunk/src/lib/config/testdata/spec13.spec
    trunk/src/lib/config/testdata/spec14.spec
    trunk/src/lib/config/testdata/spec15.spec
    trunk/src/lib/config/testdata/spec16.spec
    trunk/src/lib/config/testdata/spec17.spec
    trunk/src/lib/config/testdata/spec18.spec
    trunk/src/lib/config/testdata/spec19.spec
    trunk/src/lib/config/testdata/spec2.spec
    trunk/src/lib/config/testdata/spec20.spec
    trunk/src/lib/config/testdata/spec21.spec
    trunk/src/lib/config/testdata/spec22.spec
    trunk/src/lib/config/testdata/spec23.spec
    trunk/src/lib/config/testdata/spec24.spec
    trunk/src/lib/config/testdata/spec25.spec
    trunk/src/lib/config/testdata/spec26.spec
    trunk/src/lib/config/testdata/spec27.spec
    trunk/src/lib/config/testdata/spec28.spec
    trunk/src/lib/config/testdata/spec3.spec
    trunk/src/lib/config/testdata/spec4.spec
    trunk/src/lib/config/testdata/spec5.spec
    trunk/src/lib/config/testdata/spec6.spec
    trunk/src/lib/config/testdata/spec7.spec
    trunk/src/lib/config/testdata/spec8.spec
    trunk/src/lib/config/testdata/spec9.spec
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/src/lib/config/Makefile.am
    trunk/src/lib/config/tests/Makefile.am
    trunk/src/lib/config/tests/data_def_unittests_config.h.in
    trunk/src/lib/python/isc/config/tests/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Oct  2 06:45:45 2010
@@ -495,7 +495,7 @@
                  src/lib/python/isc/notify/tests/Makefile
                  src/lib/config/Makefile
                  src/lib/config/tests/Makefile
-                 src/lib/config/testdata/Makefile
+                 src/lib/config/tests/testdata/Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/tests/Makefile
                  src/lib/dns/tests/testdata/Makefile

Modified: trunk/src/lib/config/Makefile.am
==============================================================================
--- trunk/src/lib/config/Makefile.am (original)
+++ trunk/src/lib/config/Makefile.am Sat Oct  2 06:45:45 2010
@@ -1,4 +1,4 @@
-SUBDIRS = . testdata tests
+SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
@@ -8,45 +8,3 @@
 libcfgclient_la_SOURCES = config_data.h config_data.cc module_spec.h module_spec.cc ccsession.cc ccsession.h
 
 CLEANFILES = *.gcno *.gcda
-
-EXTRA_DIST =  testdata/b10-config-bad1.db
-EXTRA_DIST += testdata/b10-config-bad2.db
-EXTRA_DIST += testdata/b10-config-bad3.db
-EXTRA_DIST += testdata/b10-config-bad4.db
-EXTRA_DIST += testdata/b10-config.db.master #.db will be auto-generated
-EXTRA_DIST += testdata/data22_1.data
-EXTRA_DIST += testdata/data22_2.data
-EXTRA_DIST += testdata/data22_3.data
-EXTRA_DIST += testdata/data22_4.data
-EXTRA_DIST += testdata/data22_5.data
-EXTRA_DIST += testdata/data22_6.data
-EXTRA_DIST += testdata/data22_7.data
-EXTRA_DIST += testdata/data22_8.data
-EXTRA_DIST += testdata/spec1.spec
-EXTRA_DIST += testdata/spec2.spec
-EXTRA_DIST += testdata/spec3.spec
-EXTRA_DIST += testdata/spec4.spec
-EXTRA_DIST += testdata/spec5.spec
-EXTRA_DIST += testdata/spec6.spec
-EXTRA_DIST += testdata/spec7.spec
-EXTRA_DIST += testdata/spec8.spec
-EXTRA_DIST += testdata/spec9.spec
-EXTRA_DIST += testdata/spec10.spec
-EXTRA_DIST += testdata/spec11.spec
-EXTRA_DIST += testdata/spec12.spec
-EXTRA_DIST += testdata/spec13.spec
-EXTRA_DIST += testdata/spec14.spec
-EXTRA_DIST += testdata/spec15.spec
-EXTRA_DIST += testdata/spec16.spec
-EXTRA_DIST += testdata/spec17.spec
-EXTRA_DIST += testdata/spec18.spec
-EXTRA_DIST += testdata/spec19.spec
-EXTRA_DIST += testdata/spec20.spec
-EXTRA_DIST += testdata/spec21.spec
-EXTRA_DIST += testdata/spec22.spec
-EXTRA_DIST += testdata/spec23.spec
-EXTRA_DIST += testdata/spec24.spec
-EXTRA_DIST += testdata/spec25.spec
-EXTRA_DIST += testdata/spec26.spec
-EXTRA_DIST += testdata/spec27.spec
-EXTRA_DIST += testdata/spec28.spec

Modified: trunk/src/lib/config/tests/Makefile.am
==============================================================================
--- trunk/src/lib/config/tests/Makefile.am (original)
+++ trunk/src/lib/config/tests/Makefile.am Sat Oct  2 06:45:45 2010
@@ -1,3 +1,5 @@
+SUBDIRS = testdata .
+
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)

Modified: trunk/src/lib/config/tests/data_def_unittests_config.h.in
==============================================================================
--- trunk/src/lib/config/tests/data_def_unittests_config.h.in (original)
+++ trunk/src/lib/config/tests/data_def_unittests_config.h.in Sat Oct  2 06:45:45 2010
@@ -12,4 +12,4 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#define TEST_DATA_PATH "@abs_srcdir@/../testdata"
+#define TEST_DATA_PATH "@abs_srcdir@/testdata"

Modified: trunk/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/config/tests/Makefile.am (original)
+++ trunk/src/lib/python/isc/config/tests/Makefile.am Sat Oct  2 06:45:45 2010
@@ -10,7 +10,7 @@
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
-	CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \
-	CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/testdata \
+	CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/tests/testdata \
+	CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/tests/testdata \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
 	done

More information about the bind10-changes mailing list