From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 6 Mar 2013 04:09:52 +0000 (+0530)
Subject: [2641] Rename and fix CMDCTL_SRC_PATH usage
X-Git-Tag: bind10-1.1.0beta1-release~51^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99fbbc37fe2c3e465af2e1e5990b89602b02e8d4;p=thirdparty%2Fkea.git

[2641] Rename and fix CMDCTL_SRC_PATH usage
---

diff --git a/src/bin/cmdctl/tests/Makefile.am b/src/bin/cmdctl/tests/Makefile.am
index e2e0361b85..f24cf73ba6 100644
--- a/src/bin/cmdctl/tests/Makefile.am
+++ b/src/bin/cmdctl/tests/Makefile.am
@@ -25,8 +25,8 @@ endif
 	echo Running test: $$pytest ; \
 	$(LIBRARY_PATH_PLACEHOLDER) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/cmdctl \
+	CMDCTL_SRC_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
 	CMDCTL_BUILD_PATH=$(abs_top_builddir)/src/bin/cmdctl \
-	CMDCTL_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
 	B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done
diff --git a/src/bin/cmdctl/tests/b10-certgen_test.py b/src/bin/cmdctl/tests/b10-certgen_test.py
index 3cc61e5239..56630bc895 100644
--- a/src/bin/cmdctl/tests/b10-certgen_test.py
+++ b/src/bin/cmdctl/tests/b10-certgen_test.py
@@ -172,10 +172,7 @@ class TestCertGenTool(unittest.TestCase):
         """
         Tests a few pre-created certificates with the -c option
         """
-        if ('CMDCTL_TESTDATA_PATH' in os.environ):
-            path = os.environ['CMDCTL_TESTDATA_PATH'] + "/tests/testdata/"
-        else:
-            path = "testdata/"
+        path = os.environ['CMDCTL_SRC_PATH'] + '/tests/testdata/'
         self.validate_certificate(10, path + 'expired-certfile.pem')
         self.validate_certificate(100, path + 'mangled-certfile.pem')
         self.validate_certificate(17, path + 'noca-certfile.pem')
diff --git a/src/bin/cmdctl/tests/cmdctl_test.py b/src/bin/cmdctl/tests/cmdctl_test.py
index 522ff03891..82042fe86b 100644
--- a/src/bin/cmdctl/tests/cmdctl_test.py
+++ b/src/bin/cmdctl/tests/cmdctl_test.py
@@ -22,9 +22,9 @@ import sys
 from cmdctl import *
 import isc.log
 
-assert 'CMDCTL_TESTDATA_PATH' in os.environ,\
+assert 'CMDCTL_SRC_PATH' in os.environ,\
        "Please run this test with 'make check'"
-SRC_FILE_PATH = os.environ['CMDCTL_TESTDATA_PATH'] + os.sep
+SRC_FILE_PATH = os.environ['CMDCTL_SRC_PATH'] + os.sep
 
 assert 'CMDCTL_BUILD_PATH' in os.environ,\
        "Please run this test with 'make check'"