diff options
| author | JINMEI Tatuya <jinmei@isc.org> | 2011-09-10 00:57:43 +0200 |
|---|---|---|
| committer | JINMEI Tatuya <jinmei@isc.org> | 2011-09-10 00:57:43 +0200 |
| commit | 4948e0c8965c3d39b6e1bcb1bdb12b9615260a27 (patch) | |
| tree | 5afc75461abc0e499605abd1e033803e066f3bdd /src/bin/cfgmgr | |
| parent | [master] fixed a build error on MacOS-X g++ (diff) | |
| download | kea-4948e0c8965c3d39b6e1bcb1bdb12b9615260a27.tar.xz kea-4948e0c8965c3d39b6e1bcb1bdb12b9615260a27.zip | |
[1101] build setup changes so that we can use a dedicated package directory
for python logging message scripts.
Diffstat (limited to 'src/bin/cfgmgr')
| -rwxr-xr-x | src/bin/cfgmgr/b10-cfgmgr.py.in | 2 | ||||
| -rw-r--r-- | src/bin/cfgmgr/plugins/tests/Makefile.am | 4 | ||||
| -rw-r--r-- | src/bin/cfgmgr/tests/Makefile.am | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/cfgmgr/b10-cfgmgr.py.in b/src/bin/cfgmgr/b10-cfgmgr.py.in index 8befbdf10b..2ccc4304b0 100755 --- a/src/bin/cfgmgr/b10-cfgmgr.py.in +++ b/src/bin/cfgmgr/b10-cfgmgr.py.in @@ -28,7 +28,7 @@ import os.path import isc.log isc.log.init("b10-cfgmgr") from isc.config.cfgmgr import ConfigManager, ConfigManagerDataReadError, logger -from cfgmgr_messages import * +from isc.log_messages.cfgmgr_messages import * isc.util.process.rename() diff --git a/src/bin/cfgmgr/plugins/tests/Makefile.am b/src/bin/cfgmgr/plugins/tests/Makefile.am index 07b7a858c2..d4b87505ea 100644 --- a/src/bin/cfgmgr/plugins/tests/Makefile.am +++ b/src/bin/cfgmgr/plugins/tests/Makefile.am @@ -19,8 +19,8 @@ if ENABLE_PYTHON_COVERAGE endif for pytest in $(PYTESTS) ; do \ 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 \ + B10_TEST_PLUGIN_DIR=$(abs_srcdir)/..:$(abs_builddir)/.. \ + PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/cfgmgr:$(abs_top_builddir)/src/lib/dns/python/.libs \ $(LIBRARY_PATH_PLACEHOLDER) \ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \ done diff --git a/src/bin/cfgmgr/tests/Makefile.am b/src/bin/cfgmgr/tests/Makefile.am index 99f8cc9471..41edc8edb6 100644 --- a/src/bin/cfgmgr/tests/Makefile.am +++ b/src/bin/cfgmgr/tests/Makefile.am @@ -21,9 +21,9 @@ endif for pytest in $(PYTESTS) ; do \ echo Running test: $$pytest ; \ chmod +x $(abs_builddir)/$$pytest ; \ - env TESTDATA_PATH=$(abs_srcdir)/testdata \ + TESTDATA_PATH=$(abs_srcdir)/testdata \ $(LIBRARY_PATH_PLACEHOLDER) \ - 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/python/isc/config \ + PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/cfgmgr:$(abs_top_builddir)/src/lib/python/isc/config \ $(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \ done |