From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 19 Oct 2012 07:16:55 +0000 (+0200)
Subject: samba.tests.docs: Assume docs are generated by waf.
X-Git-Tag: ldb-1.1.14~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed37b8ad14d496114654017d394fa18d63456aee;p=thirdparty%2Fsamba.git

samba.tests.docs: Assume docs are generated by waf.
---

diff --git a/source4/scripting/python/samba/tests/docs.py b/source4/scripting/python/samba/tests/docs.py
index d4d4a6249db..7105afd6220 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()