Fix broken docbook tests which weren't using the xsltproc found by test framework

10 files changed, 30 insertions, 11 deletions

diff --git a/test/Docbook/basic/epub/epub_cmd.py b/test/Docbook/basic/epub/epub_cmd.py
index b79d185..285d940 100644
--- a/test/Docbook/basic/epub/epub_cmd.py
+++ b/test/Docbook/basic/epub/epub_cmd.py
@@ -34,18 +34,17 @@ test = TestSCons.TestSCons()
 xsltproc = test.where_is('xsltproc')
 if not xsltproc:
     test.skip_test('No xsltproc executable found, skipping test.\n')
-
 test.dir_fixture('image')
 
 # Normal invocation
-test.run(arguments=['-f','SConstruct.cmd'], stderr=None)
+test.run(arguments=['-f','SConstruct.cmd','DOCBOOK_XSLTPROC=%s'%xsltproc], stderr=None)
 test.must_exist(test.workpath('manual.epub'))
 test.must_exist(test.workpath('OEBPS','toc.ncx'))
 test.must_exist(test.workpath('OEBPS','content.opf'))
 test.must_exist(test.workpath('META-INF','container.xml'))
 
 # Cleanup
-test.run(arguments=['-f','SConstruct.cmd','-c'])
+test.run(arguments=['-f','SConstruct.cmd','-c','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_not_exist(test.workpath('manual.epub'))
 test.must_not_exist(test.workpath('OEBPS'))
 test.must_not_exist(test.workpath('META-INF'))
diff --git a/test/Docbook/basic/epub/image/SConstruct.cmd b/test/Docbook/basic/epub/image/SConstruct.cmd
index 27cf2c8..9b5e4cb 100644
--- a/test/Docbook/basic/epub/image/SConstruct.cmd
+++ b/test/Docbook/basic/epub/image/SConstruct.cmd
@@ -1,2 +1,6 @@
 env = Environment(DOCBOOK_PREFER_XSLTPROC=1, tools=['docbook'])
+DOCBOOK_XSLTPROC = ARGUMENTS.get('DOCBOOK_XSLTPROC', "")
+if DOCBOOK_XSLTPROC:
+    env['DOCBOOK_XSLTPROC'] = DOCBOOK_XSLTPROC
+
 env.DocbookEpub('manual')
diff --git a/test/Docbook/basic/html/html_cmd.py b/test/Docbook/basic/html/html_cmd.py
index acb4dad..cfc71b0 100644
--- a/test/Docbook/basic/html/html_cmd.py
+++ b/test/Docbook/basic/html/html_cmd.py
@@ -38,11 +38,11 @@ if not xsltproc:
 test.dir_fixture('image')
 
 # Normal invocation
-test.run(arguments=['-f','SConstruct.cmd'])
+test.run(arguments=['-f','SConstruct.cmd','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_exist(test.workpath('manual.html'))
 
 # Cleanup
-test.run(arguments=['-f','SConstruct.cmd','-c'])
+test.run(arguments=['-f','SConstruct.cmd','-c','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_not_exist(test.workpath('manual.html'))
 
 test.pass_test()
diff --git a/test/Docbook/basic/html/image/SConstruct.cmd b/test/Docbook/basic/html/image/SConstruct.cmd
index 20b4aa2..3e58102 100644
--- a/test/Docbook/basic/html/image/SConstruct.cmd
+++ b/test/Docbook/basic/html/image/SConstruct.cmd
@@ -1,3 +1,7 @@
 env = Environment(DOCBOOK_PREFER_XSLTPROC=1, tools=['docbook'])
+DOCBOOK_XSLTPROC = ARGUMENTS.get('DOCBOOK_XSLTPROC', "")
+if DOCBOOK_XSLTPROC:
+    env['DOCBOOK_XSLTPROC'] = DOCBOOK_XSLTPROC
+
 env.DocbookHtml('manual')
 
diff --git a/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py b/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
index e1ad49a..b194b70 100644
--- a/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
+++ b/test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
@@ -39,11 +39,11 @@ if not xsltproc:
 test.dir_fixture('image')
 
 # Normal invocation
-test.run(arguments=['-f','SConstruct.cmd'], stderr=None)
+test.run(arguments=['-f','SConstruct.cmd','DOCBOOK_XSLTPROC=%s'%xsltproc], stderr=None)
 test.must_exist(test.workpath('index.html'))
 
 # Cleanup
-test.run(arguments=['-f','SConstruct.cmd','-c'])
+test.run(arguments=['-f','SConstruct.cmd','-c','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_not_exist(test.workpath('index.html'))
 
 test.pass_test()
diff --git a/test/Docbook/basic/htmlchunked/image/SConstruct.cmd b/test/Docbook/basic/htmlchunked/image/SConstruct.cmd
index e2406f2..8734147 100644
--- a/test/Docbook/basic/htmlchunked/image/SConstruct.cmd
+++ b/test/Docbook/basic/htmlchunked/image/SConstruct.cmd
@@ -1,3 +1,7 @@
 env = Environment(DOCBOOK_PREFER_XSLTPROC=1, tools=['docbook'])
+DOCBOOK_XSLTPROC = ARGUMENTS.get('DOCBOOK_XSLTPROC', "")
+if DOCBOOK_XSLTPROC:
+    env['DOCBOOK_XSLTPROC'] = DOCBOOK_XSLTPROC
+
 env.DocbookHtmlChunked('manual')
 
diff --git a/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py b/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
index 8e1c1b6..541ef75 100644
--- a/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
+++ b/test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
@@ -38,13 +38,13 @@ if not xsltproc:
 test.dir_fixture('image')
 
 # Normal invocation
-test.run(arguments=['-f','SConstruct.cmd'], stderr=None)
+test.run(arguments=['-f','SConstruct.cmd','DOCBOOK_XSLTPROC=%s'%xsltproc], stderr=None)
 test.must_exist(test.workpath('index.html'))
 test.must_exist(test.workpath('htmlhelp.hhp'))
 test.must_exist(test.workpath('toc.hhc'))
 
 # Cleanup
-test.run(arguments=['-f','SConstruct.cmd','-c'])
+test.run(arguments=['-f','SConstruct.cmd','-c','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_not_exist(test.workpath('index.html'))
 test.must_not_exist(test.workpath('htmlhelp.hhp'))
 test.must_not_exist(test.workpath('toc.hhc'))
diff --git a/test/Docbook/basic/htmlhelp/image/SConstruct.cmd b/test/Docbook/basic/htmlhelp/image/SConstruct.cmd
index 29fb4fa..e3e0193 100644
--- a/test/Docbook/basic/htmlhelp/image/SConstruct.cmd
+++ b/test/Docbook/basic/htmlhelp/image/SConstruct.cmd
@@ -1,3 +1,7 @@
 env = Environment(DOCBOOK_PREFER_XSLTPROC=1, tools=['docbook'])
+DOCBOOK_XSLTPROC = ARGUMENTS.get('DOCBOOK_XSLTPROC', "")
+if DOCBOOK_XSLTPROC:
+    env['DOCBOOK_XSLTPROC'] = DOCBOOK_XSLTPROC
+
 env.DocbookHtmlhelp('manual')
 
diff --git a/test/Docbook/basic/man/image/SConstruct.cmd b/test/Docbook/basic/man/image/SConstruct.cmd
index 8b1406b..122c0ce 100644
--- a/test/Docbook/basic/man/image/SConstruct.cmd
+++ b/test/Docbook/basic/man/image/SConstruct.cmd
@@ -1,3 +1,7 @@
 env = Environment(DOCBOOK_PREFER_XSLTPROC=1, tools=['docbook'])
+DOCBOOK_XSLTPROC = ARGUMENTS.get('DOCBOOK_XSLTPROC', "")
+if DOCBOOK_XSLTPROC:
+    env['DOCBOOK_XSLTPROC'] = DOCBOOK_XSLTPROC
+
 env.DocbookMan('refdb')
 
diff --git a/test/Docbook/basic/man/man_cmd.py b/test/Docbook/basic/man/man_cmd.py
index f5127e3..ecfc9bd 100644
--- a/test/Docbook/basic/man/man_cmd.py
+++ b/test/Docbook/basic/man/man_cmd.py
@@ -38,12 +38,12 @@ if not xsltproc:
 test.dir_fixture('image')
 
 # Normal invocation
-test.run(arguments=['-f','SConstruct.cmd'], stderr=None)
+test.run(arguments=['-f','SConstruct.cmd','DOCBOOK_XSLTPROC=%s'%xsltproc], stderr=None)
 test.must_exist(test.workpath('refdb.8'))
 test.must_exist(test.workpath('refdb.sh.8'))
 
 # Cleanup
-test.run(arguments=['-f','SConstruct.cmd','-c'])
+test.run(arguments=['-f','SConstruct.cmd','-c','DOCBOOK_XSLTPROC=%s'%xsltproc])
 test.must_not_exist(test.workpath('refdb.8'))
 test.must_not_exist(test.workpath('refdb.sh.8'))