summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-10-19 09:16:55 +0200
committerJelmer Vernooij <jelmer@samba.org>2012-10-19 09:16:55 +0200
commited37b8ad14d496114654017d394fa18d63456aee (patch)
tree600bfe67ad2550451438d100a4175fe413ad8b0a /source4/scripting/python
parentcfa72bcc5e93a840fc07f5d419216443ef8f7599 (diff)
downloadsamba-ed37b8ad14d496114654017d394fa18d63456aee.tar.gz
samba-ed37b8ad14d496114654017d394fa18d63456aee.tar.bz2
samba-ed37b8ad14d496114654017d394fa18d63456aee.zip
samba.tests.docs: Assume docs are generated by waf.
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/tests/docs.py8
1 files changed, 6 insertions, 2 deletions
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()