Merge 81beb77 into 03be89c

SCons · Nov 3, 2018 · 662aab5 · 662aab5
2 parents 03be89c + 81beb77
commit 662aab5
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 21 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,13 +1,13 @@
-version: '3.0.1.{build}'
+#version: '3.0.1.{build}'
 
 image: Visual Studio 2017
 shallow_clone: true
 
-cache:
-  - downloads -> appveyor.yml
-  - '%LOCALAPPDATA%\pip\Cache'
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+#cache:
+#  - downloads -> appveyor.yml
+#  - '%LOCALAPPDATA%\pip\Cache'
+#  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+#  - C:\ProgramData\chocolatey\lib -> appveyor.yml
 
 install:
   - "set PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\cygwin64\\bin;C:\\msys64;%PATH%"
@@ -17,7 +17,10 @@ install:
   - choco install --allow-empty-checksums dmd
   - choco install --allow-empty-checksums ldc
   - choco install --allow-empty-checksums swig
-  - choco install --allow-empty-checksums vswhere  
+  - choco install --allow-empty-checksums vswhere
+  - choco install --allow-empty-checksums xsltproc
+  - choco install --allow-empty-checksums git.install
+
 
 environment:
   matrix:

diff --git a/test/Docbook/basic/epub/epub_cmd.py b/test/Docbook/basic/epub/epub_cmd.py
@@ -34,18 +34,17 @@
 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
@@ -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
@@ -38,11 +38,11 @@
 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
@@ -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
@@ -39,11 +39,11 @@
 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
@@ -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
@@ -38,13 +38,13 @@
 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
@@ -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
@@ -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
@@ -38,12 +38,12 @@
 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'))
 

diff --git a/test/SWIG/live.py b/test/SWIG/live.py
@@ -145,7 +145,7 @@
 
 test.run(arguments = ldmodule_prefix+'bar' + _dll)
 
-test.must_match('wrapper.out', "wrapper.py" + os.linesep)
+test.must_match('wrapper.out', "wrapper.py\n")
 
 test.run(program = python, stdin = """\
 from __future__ import print_function

diff --git a/test/YACC/live.py b/test/YACC/live.py
@@ -158,7 +158,7 @@
 
 test.up_to_date(arguments = 'bar' + _exe)
 
-test.must_match(test.workpath('wrapper.out'), "wrapper.py" + os.linesep)
+test.must_match(test.workpath('wrapper.out'), "wrapper.py\n")
 
 test.run(program = test.workpath('bar'), stdin = "b\n", stdout = "bar.y\n")
 

diff --git a/test/fixture/wrapper.py b/test/fixture/wrapper.py
@@ -2,5 +2,5 @@
 import sys
 if '--version' not in sys.argv and '-dumpversion' not in sys.argv:
     path = os.path.join(os.path.dirname(os.path.relpath(__file__)), 'wrapper.out')
-    open(path, 'w').write("wrapper.py\n")
+    open(path, 'wb').write(b"wrapper.py\n")
 os.system(" ".join(sys.argv[1:]))