Browse Source

[trac875] Fix make distcheck

Michal 'vorner' Vaner 14 years ago
parent
commit
f6e9a1186d

+ 1 - 1
src/bin/cfgmgr/plugins/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = tests
 SUBDIRS = tests
-EXTRA_DIST = README
+EXTRA_DIST = README tsig_keys.py tsig_keys.spec
 
 
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugin_DATA = tsig_keys.py tsig_keys.spec
 config_plugin_DATA = tsig_keys.py tsig_keys.spec

+ 3 - 1
src/bin/cfgmgr/plugins/tests/Makefile.am

@@ -1,6 +1,8 @@
 PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = tsig_keys_test.py
 PYTESTS = tsig_keys_test.py
 
 
+EXTRA_DIST = $(PYTESTS)
+
 # test using command-line arguments, so use check-local target instead of TESTS
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 check-local:
 if ENABLE_PYTHON_COVERAGE
 if ENABLE_PYTHON_COVERAGE
@@ -12,6 +14,6 @@ endif
 	echo Running test: $$pytest ; \
 	echo Running test: $$pytest ; \
 	env B10_TEST_PLUGIN_DIR=$(abs_srcdir)/..:$(abs_builddir)/.. \
 	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 \
 	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
 	done
 
 

+ 2 - 2
src/lib/python/isc/util/tests/file_test.py

@@ -19,8 +19,8 @@ import unittest
 class FileTest(unittest.TestCase):
 class FileTest(unittest.TestCase):
     def test_search_path_find(self):
     def test_search_path_find(self):
         """Test it returns the first occurence of the file"""
         """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/', '.',
                                                   ['/no/such/directory/', '.',
                                                   '../tests/']))
                                                   '../tests/']))