From ed37b8ad14d496114654017d394fa18d63456aee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 19 Oct 2012 09:16:55 +0200 Subject: samba.tests.docs: Assume docs are generated by waf. --- source4/scripting/python/samba/tests/docs.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/tests/docs.py b/source4/scripting/python/samba/tests/docs.py index d4d4a6249d..7105afd622 100644 --- a/source4/scripting/python/samba/tests/docs.py +++ b/source4/scripting/python/samba/tests/docs.py @@ -44,10 +44,14 @@ class NoXsltProc(Exception): def get_documented_parameters(sourcedir): + path = os.path.join(sourcedir, "bin", "default", "docs-xml", "smbdotconf") + if not os.path.exists(os.path.join(path, "parameters.all.xml")): + raise Exception("Unable to find parameters.all.xml") try: p = subprocess.Popen( - ["xsltproc", "--xinclude", "--param", "smb.context", "ALL", "generate-context.xsl", "parameters.all.xml"], - stderr=subprocess.STDOUT, stdout=subprocess.PIPE, cwd=os.path.join(sourcedir, "docs-xml", "smbdotconf")) + ["xsltproc", "--xinclude", "--param", "smb.context", "ALL", os.path.join(sourcedir, "docs-xml", "smbdotconf", "generate-context.xsl"), "parameters.all.xml"], + stderr=subprocess.STDOUT, stdout=subprocess.PIPE, + cwd=path) except OSError, e: if e.errno == errno.ENOENT: raise NoXsltProc() -- cgit