BIND 10 trac2964, updated. 9b95e643da6c3b1be36b0700e8198b9fec870515 [2964] distcheck fix: use a local copy of datasrc.spec for tests.

[BIND 10 source code commits]

The branch, trac2964 has been updated
       via  9b95e643da6c3b1be36b0700e8198b9fec870515 (commit)
      from  53d462aedda7e6f2527dff34a6da25ef58ec298b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b95e643da6c3b1be36b0700e8198b9fec870515
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jun 3 22:38:56 2013 -0700

    [2964] distcheck fix: use a local copy of datasrc.spec for tests.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/server_common/tests/Makefile.am |    8 ++++++++
 .../tests/datasrc_clients_mgr_test.py              |    3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/server_common/tests/Makefile.am b/src/lib/python/isc/server_common/tests/Makefile.am
index b87dbfb..86006d5 100644
--- a/src/lib/python/isc/server_common/tests/Makefile.am
+++ b/src/lib/python/isc/server_common/tests/Makefile.am
@@ -9,6 +9,14 @@ if SET_ENV_LIBRARY_PATH
 LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/util/threads/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
+# We use our own "default" datasrc.spec, tweaking some installation path,
+# so we can run the tests with something very close to the actual spec and
+# yet independent from installation environment.
+BUILT_SOURCES = datasrc.spec
+datasrc.spec: $(abs_top_builddir)/src/bin/cfgmgr/plugins/datasrc.spec.pre
+	$(SED) -e "s|@@STATIC_ZONE_FILE@@|$(abs_top_builddir)/src/lib/datasrc/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(abs_builddir)/zone.sqlite3|" $(abs_top_builddir)/src/bin/cfgmgr/plugins/datasrc.spec.pre >$@
+CLEANFILES = datasrc.spec zone.sqlite3
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 if ENABLE_PYTHON_COVERAGE
diff --git a/src/lib/python/isc/server_common/tests/datasrc_clients_mgr_test.py b/src/lib/python/isc/server_common/tests/datasrc_clients_mgr_test.py
index 193e01a..827a417 100644
--- a/src/lib/python/isc/server_common/tests/datasrc_clients_mgr_test.py
+++ b/src/lib/python/isc/server_common/tests/datasrc_clients_mgr_test.py
@@ -20,8 +20,9 @@ import unittest
 import isc.config
 import os
 
+# A (slightly tweaked) local copy of the default data source spec
 DATASRC_SPECFILE = os.environ["B10_FROM_BUILD"] + \
-    "/src/bin/cfgmgr/plugins/datasrc.spec"
+    "/src/lib/python/isc/server_common/tests/datasrc.spec"
 DEFAULT_CONFIG = \
     isc.config.ConfigData(isc.config.module_spec_from_file(DATASRC_SPECFILE)).\
     get_full_config()