[svn] commit: r2978 - in /branches/trac344: ./ 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
Mon Sep 20 05:53:12 UTC 2010
Author: jinmei
Date: Mon Sep 20 05:53:12 2010
New Revision: 2978
Log:
moved src/lib/config/testdata under src/lib/config/tests/ for consistency.
adjusted paths to the data in other files.
Added:
branches/trac344/src/lib/config/tests/testdata/
branches/trac344/src/lib/config/tests/testdata/Makefile.am
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/Makefile.am
branches/trac344/src/lib/config/tests/testdata/b10-config-bad1.db
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/b10-config-bad1.db
branches/trac344/src/lib/config/tests/testdata/b10-config-bad2.db
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/b10-config-bad2.db
branches/trac344/src/lib/config/tests/testdata/b10-config-bad3.db
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/b10-config-bad3.db
branches/trac344/src/lib/config/tests/testdata/b10-config-bad4.db
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/b10-config-bad4.db
branches/trac344/src/lib/config/tests/testdata/b10-config.db.master
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/b10-config.db.master
branches/trac344/src/lib/config/tests/testdata/data22_1.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_1.data
branches/trac344/src/lib/config/tests/testdata/data22_2.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_2.data
branches/trac344/src/lib/config/tests/testdata/data22_3.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_3.data
branches/trac344/src/lib/config/tests/testdata/data22_4.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_4.data
branches/trac344/src/lib/config/tests/testdata/data22_5.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_5.data
branches/trac344/src/lib/config/tests/testdata/data22_6.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_6.data
branches/trac344/src/lib/config/tests/testdata/data22_7.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_7.data
branches/trac344/src/lib/config/tests/testdata/data22_8.data
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/data22_8.data
branches/trac344/src/lib/config/tests/testdata/spec1.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec1.spec
branches/trac344/src/lib/config/tests/testdata/spec10.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec10.spec
branches/trac344/src/lib/config/tests/testdata/spec11.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec11.spec
branches/trac344/src/lib/config/tests/testdata/spec12.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec12.spec
branches/trac344/src/lib/config/tests/testdata/spec13.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec13.spec
branches/trac344/src/lib/config/tests/testdata/spec14.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec14.spec
branches/trac344/src/lib/config/tests/testdata/spec15.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec15.spec
branches/trac344/src/lib/config/tests/testdata/spec16.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec16.spec
branches/trac344/src/lib/config/tests/testdata/spec17.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec17.spec
branches/trac344/src/lib/config/tests/testdata/spec18.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec18.spec
branches/trac344/src/lib/config/tests/testdata/spec19.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec19.spec
branches/trac344/src/lib/config/tests/testdata/spec2.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec2.spec
branches/trac344/src/lib/config/tests/testdata/spec20.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec20.spec
branches/trac344/src/lib/config/tests/testdata/spec21.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec21.spec
branches/trac344/src/lib/config/tests/testdata/spec22.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec22.spec
branches/trac344/src/lib/config/tests/testdata/spec23.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec23.spec
branches/trac344/src/lib/config/tests/testdata/spec24.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec24.spec
branches/trac344/src/lib/config/tests/testdata/spec25.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec25.spec
branches/trac344/src/lib/config/tests/testdata/spec26.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec26.spec
branches/trac344/src/lib/config/tests/testdata/spec27.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec27.spec
branches/trac344/src/lib/config/tests/testdata/spec28.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec28.spec
branches/trac344/src/lib/config/tests/testdata/spec3.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec3.spec
branches/trac344/src/lib/config/tests/testdata/spec4.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec4.spec
branches/trac344/src/lib/config/tests/testdata/spec5.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec5.spec
branches/trac344/src/lib/config/tests/testdata/spec6.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec6.spec
branches/trac344/src/lib/config/tests/testdata/spec7.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec7.spec
branches/trac344/src/lib/config/tests/testdata/spec8.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec8.spec
branches/trac344/src/lib/config/tests/testdata/spec9.spec
- copied, changed from r2977, branches/trac344/src/lib/config/testdata/spec9.spec
Removed:
branches/trac344/src/lib/config/testdata/Makefile.am
branches/trac344/src/lib/config/testdata/b10-config-bad1.db
branches/trac344/src/lib/config/testdata/b10-config-bad2.db
branches/trac344/src/lib/config/testdata/b10-config-bad3.db
branches/trac344/src/lib/config/testdata/b10-config-bad4.db
branches/trac344/src/lib/config/testdata/b10-config.db.master
branches/trac344/src/lib/config/testdata/data22_1.data
branches/trac344/src/lib/config/testdata/data22_2.data
branches/trac344/src/lib/config/testdata/data22_3.data
branches/trac344/src/lib/config/testdata/data22_4.data
branches/trac344/src/lib/config/testdata/data22_5.data
branches/trac344/src/lib/config/testdata/data22_6.data
branches/trac344/src/lib/config/testdata/data22_7.data
branches/trac344/src/lib/config/testdata/data22_8.data
branches/trac344/src/lib/config/testdata/spec1.spec
branches/trac344/src/lib/config/testdata/spec10.spec
branches/trac344/src/lib/config/testdata/spec11.spec
branches/trac344/src/lib/config/testdata/spec12.spec
branches/trac344/src/lib/config/testdata/spec13.spec
branches/trac344/src/lib/config/testdata/spec14.spec
branches/trac344/src/lib/config/testdata/spec15.spec
branches/trac344/src/lib/config/testdata/spec16.spec
branches/trac344/src/lib/config/testdata/spec17.spec
branches/trac344/src/lib/config/testdata/spec18.spec
branches/trac344/src/lib/config/testdata/spec19.spec
branches/trac344/src/lib/config/testdata/spec2.spec
branches/trac344/src/lib/config/testdata/spec20.spec
branches/trac344/src/lib/config/testdata/spec21.spec
branches/trac344/src/lib/config/testdata/spec22.spec
branches/trac344/src/lib/config/testdata/spec23.spec
branches/trac344/src/lib/config/testdata/spec24.spec
branches/trac344/src/lib/config/testdata/spec25.spec
branches/trac344/src/lib/config/testdata/spec26.spec
branches/trac344/src/lib/config/testdata/spec27.spec
branches/trac344/src/lib/config/testdata/spec28.spec
branches/trac344/src/lib/config/testdata/spec3.spec
branches/trac344/src/lib/config/testdata/spec4.spec
branches/trac344/src/lib/config/testdata/spec5.spec
branches/trac344/src/lib/config/testdata/spec6.spec
branches/trac344/src/lib/config/testdata/spec7.spec
branches/trac344/src/lib/config/testdata/spec8.spec
branches/trac344/src/lib/config/testdata/spec9.spec
Modified:
branches/trac344/configure.ac
branches/trac344/src/lib/config/Makefile.am
branches/trac344/src/lib/config/tests/Makefile.am
branches/trac344/src/lib/config/tests/data_def_unittests_config.h.in
branches/trac344/src/lib/python/isc/config/tests/Makefile.am
Modified: branches/trac344/configure.ac
==============================================================================
--- branches/trac344/configure.ac (original)
+++ branches/trac344/configure.ac Mon Sep 20 05:53:12 2010
@@ -456,7 +456,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/python/Makefile
Modified: branches/trac344/src/lib/config/Makefile.am
==============================================================================
--- branches/trac344/src/lib/config/Makefile.am (original)
+++ branches/trac344/src/lib/config/Makefile.am Mon Sep 20 05:53:12 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
Modified: branches/trac344/src/lib/config/tests/Makefile.am
==============================================================================
--- branches/trac344/src/lib/config/tests/Makefile.am (original)
+++ branches/trac344/src/lib/config/tests/Makefile.am Mon Sep 20 05:53:12 2010
@@ -1,3 +1,5 @@
+SUBDIRS = testdata .
+
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CXXFLAGS = $(B10_CXXFLAGS)
Modified: branches/trac344/src/lib/config/tests/data_def_unittests_config.h.in
==============================================================================
--- branches/trac344/src/lib/config/tests/data_def_unittests_config.h.in (original)
+++ branches/trac344/src/lib/config/tests/data_def_unittests_config.h.in Mon Sep 20 05:53:12 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: branches/trac344/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- branches/trac344/src/lib/python/isc/config/tests/Makefile.am (original)
+++ branches/trac344/src/lib/python/isc/config/tests/Makefile.am Mon Sep 20 05:53:12 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