From 608ee5c478fa1cd97735e37e33129180e4f1115b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 1 Nov 2018 19:08:13 -0400 Subject: Fix m4.py test on windows --- test/fixture/wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixture/wrapper.py b/test/fixture/wrapper.py index bd8187c..55e133b 100644 --- a/test/fixture/wrapper.py +++ b/test/fixture/wrapper.py @@ -2,5 +2,5 @@ import os 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("wrapper.py\n") os.system(" ".join(sys.argv[1:])) -- cgit v0.12 From 50bdeb4f4c3bf148c242b93f1a517a11758a2d9c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 1 Nov 2018 21:33:15 -0400 Subject: Fix to write string as bytes --- test/fixture/wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixture/wrapper.py b/test/fixture/wrapper.py index 55e133b..f02ea03 100644 --- a/test/fixture/wrapper.py +++ b/test/fixture/wrapper.py @@ -2,5 +2,5 @@ import os 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, 'wb').write("wrapper.py\n") + open(path, 'wb').write(b"wrapper.py\n") os.system(" ".join(sys.argv[1:])) -- cgit v0.12 From 1048d00a474bce8b56c96f78899b4e572f564ed4 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 09:07:14 -0400 Subject: fix a couple tests broken by binary write in wrapper.py. previously compared against string with native os.linesep --- test/SWIG/live.py | 2 +- test/YACC/live.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/SWIG/live.py b/test/SWIG/live.py index a64defe..e01597d 100644 --- a/test/SWIG/live.py +++ b/test/SWIG/live.py @@ -145,7 +145,7 @@ test.up_to_date(arguments = ldmodule_prefix+'foo' + _dll) 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 index 35f6c37..a79d3db 100644 --- a/test/YACC/live.py +++ b/test/YACC/live.py @@ -158,7 +158,7 @@ test.run(arguments = 'bar' + _exe) 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") -- cgit v0.12 From 87101311de7f8fa4dd69749da83539d36aaa620c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 10:13:31 -0400 Subject: remove appveyor version string from file --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index dad0abf..24be042 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: '3.0.1.{build}' +#version: '3.0.1.{build}' image: Visual Studio 2017 shallow_clone: true -- cgit v0.12 From ec13b6bfb5c13986ef9dcb5e08697c86fbee1fcd Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 10:20:23 -0400 Subject: try to figure out appveyor error --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 24be042..f80e7d6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,11 +3,11 @@ 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%" -- cgit v0.12 From 35994cc8a0cdf610a0c3be7a444203aac8693deb Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 10:21:14 -0400 Subject: try to figure out appveyor error --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f80e7d6..24be042 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,11 +3,11 @@ 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%" -- cgit v0.12 From b0d82927a3fc3a36cedf4df3cca6bc9971811390 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 10:38:56 -0400 Subject: try to figure out appveyor error --- .appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 24be042..f80e7d6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,11 +3,11 @@ 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%" -- cgit v0.12 From d77f7222401b69c5f25cb42b4a17cab3eb3bb51b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 13:34:26 -0400 Subject: Fix broken docbook tests which weren't using the xsltproc found by test framework --- .appveyor.yml | 4 +++- test/Docbook/basic/epub/epub_cmd.py | 5 ++--- test/Docbook/basic/epub/image/SConstruct.cmd | 4 ++++ test/Docbook/basic/html/html_cmd.py | 4 ++-- test/Docbook/basic/html/image/SConstruct.cmd | 4 ++++ test/Docbook/basic/htmlchunked/htmlchunked_cmd.py | 4 ++-- test/Docbook/basic/htmlchunked/image/SConstruct.cmd | 4 ++++ test/Docbook/basic/htmlhelp/htmlhelp_cmd.py | 4 ++-- test/Docbook/basic/htmlhelp/image/SConstruct.cmd | 4 ++++ test/Docbook/basic/man/image/SConstruct.cmd | 4 ++++ test/Docbook/basic/man/man_cmd.py | 4 ++-- 11 files changed, 33 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f80e7d6..597313b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,9 @@ 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 + environment: matrix: 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')) -- cgit v0.12 From 81beb774e23947dd92200dbc98ca04191b751d9f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Fri, 2 Nov 2018 21:12:00 -0400 Subject: Add xsltproc and also force updated git to get rid of broken xsltproc wrongly included in git windows package --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 597313b..3cf65bc 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,7 +18,8 @@ install: - choco install --allow-empty-checksums ldc - choco install --allow-empty-checksums swig - choco install --allow-empty-checksums vswhere - - choco install --allow-empty-checksums xsltproc + - choco install --allow-empty-checksums xsltproc + - choco install --allow-empty-checksums git.install environment: -- cgit v0.12