BIND 10 trac875, updated. f6e9a1186d00e023021f5853e5a7a1d7c3f838cf [trac875] Fix make distcheck

[BIND 10 source code commits]

The branch, trac875 has been updated
       via  f6e9a1186d00e023021f5853e5a7a1d7c3f838cf (commit)
      from  7b25152b5bbbaff6840f88ad7ff2684f8b8062a6 (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 f6e9a1186d00e023021f5853e5a7a1d7c3f838cf
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu May 12 11:48:48 2011 +0200

    [trac875] Fix make distcheck

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

Summary of changes:
 src/bin/cfgmgr/plugins/Makefile.am         |    2 +-
 src/bin/cfgmgr/plugins/tests/Makefile.am   |    4 +++-
 src/lib/python/isc/util/tests/file_test.py |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index fdd1e89..d83c2bb 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = tests
-EXTRA_DIST = README
+EXTRA_DIST = README tsig_keys.py tsig_keys.spec
 
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugin_DATA = tsig_keys.py tsig_keys.spec
diff --git a/src/bin/cfgmgr/plugins/tests/Makefile.am b/src/bin/cfgmgr/plugins/tests/Makefile.am
index 5f1b770..48a0393 100644
--- a/src/bin/cfgmgr/plugins/tests/Makefile.am
+++ b/src/bin/cfgmgr/plugins/tests/Makefile.am
@@ -1,6 +1,8 @@
 PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = tsig_keys_test.py
 
+EXTRA_DIST = $(PYTESTS)
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 if ENABLE_PYTHON_COVERAGE
@@ -12,6 +14,6 @@ endif
 	echo Running test: $$pytest ; \
 	env B10_TEST_PLUGIN_DIR=$(abs_srcdir)/..:$(abs_builddir)/.. \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cfgmgr:$(abs_top_builddir)/src/lib/dns/python/.libs \
-	$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
+	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
 
diff --git a/src/lib/python/isc/util/tests/file_test.py b/src/lib/python/isc/util/tests/file_test.py
index 01e32d7..fb765d7 100644
--- a/src/lib/python/isc/util/tests/file_test.py
+++ b/src/lib/python/isc/util/tests/file_test.py
@@ -19,8 +19,8 @@ import unittest
 class FileTest(unittest.TestCase):
     def test_search_path_find(self):
         """Test it returns the first occurence of the file"""
-        self.assertEqual('./file_test.py',
-                         isc.util.file.path_search('file_test.py',
+        self.assertEqual('./Makefile',
+                         isc.util.file.path_search('Makefile',
                                                   ['/no/such/directory/', '.',
                                                   '../tests/']))