diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/SConstruct.py | 7 | ||||
-rw-r--r-- | test/TEX/eps_graphics2.py | 6 | ||||
-rw-r--r-- | test/TEX/multi-line_include_options.py | 90 | ||||
-rw-r--r-- | test/option-n.py | 4 |
4 files changed, 99 insertions, 8 deletions
diff --git a/test/SConstruct.py b/test/SConstruct.py index f061728..15e1c1b 100644 --- a/test/SConstruct.py +++ b/test/SConstruct.py @@ -27,16 +27,15 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestCmd import TestSCons -test = TestSCons.TestSCons(match = TestCmd.match_re) +test = TestSCons.TestSCons() test.run(arguments = ".", status = 2, stdout = "", stderr = r""" scons: \*\*\* No SConstruct file found. -""" + TestSCons.file_expr) - -test.match_function = TestCmd.match_exact +""" + TestSCons.file_expr, + match = TestCmd.match_re) wpath = test.workpath() diff --git a/test/TEX/eps_graphics2.py b/test/TEX/eps_graphics2.py index d291b0b..d388b69 100644 --- a/test/TEX/eps_graphics2.py +++ b/test/TEX/eps_graphics2.py @@ -158,7 +158,9 @@ To get a hard copy of this report call me. \begin{figure}[htbp] \begin{center} -\includegraphics{Fig1} +\includegraphics + [width=.5\textwidth] + {Fig1} \caption{Zone and Node indexing} \label{fig1} \end{center} @@ -170,7 +172,7 @@ All done now. """) # makeindex will write status messages to stderr (grrr...), so ignore it. -test.run(arguments = '.', stderr=None) +test.run(arguments = 'docs/test.pdf', stderr=None) # All (?) the files we expect will get created in the docs directory diff --git a/test/TEX/multi-line_include_options.py b/test/TEX/multi-line_include_options.py new file mode 100644 index 0000000..7d536dc --- /dev/null +++ b/test/TEX/multi-line_include_options.py @@ -0,0 +1,90 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +When an inclusion's optional argument (enclosed in square brackets: +[]) spans multiple lines (via comment wrapping), ensure that the LaTeX +Scanner doesn't throw an IndexError. + +An example of this in the wild is in Thomas Heim's epsdice LaTeX package: + \includegraphics[height=1.75ex,viewport= 3 4 38 39,% + clip=true]{\dicefile}% +In epsdice 2007/02/15, v. 2.1. +""" + +import TestSCons + +_exe = TestSCons._exe + +test = TestSCons.TestSCons() + +latex = test.where_is('latex') + +if not latex: + test.skip_test("Could not find latex; skipping test(s).\n") + +test.write('SConstruct', """\ +import os +env = Environment(ENV = { 'PATH' : os.environ['PATH'] }) +env.DVI('root.tex') +""") + +test.write('root.tex', +r"""\documentclass{article} +\usepackage{graphicx} +\begin{document} + \includegraphics[height=1.75ex,% + clip=true]{square} +\end{document} +""") + +# Dummy EPS file drawing a square +test.write('square.eps', +r"""%!PS-Adobe-2.0 EPSF-1.2 +%%BoundingBox: 0 0 20 20 + newpath + 5 5 moveto + 15 5 lineto + 15 15 lineto + 5 15 lineto + 5 5 lineto + stroke +%%EOF +""") + +test.run(arguments = '.') + +test.must_exist(test.workpath('root.dvi')) +test.must_exist(test.workpath('root.log')) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: + diff --git a/test/option-n.py b/test/option-n.py index b8dde0f..a32dfb7 100644 --- a/test/option-n.py +++ b/test/option-n.py @@ -168,8 +168,8 @@ test.fail_test(os.path.exists(test.workpath('build', 'f4.in'))) # test Configure-calls in conjunction with -n test.subdir('configure') -test.match_function = TestSCons.match_re_dotall -test.diff_function = TestSCons.diff_re +test.set_match_function(TestSCons.match_re_dotall) +test.set_diff_function(TestSCons.diff_re) test.write('configure/SConstruct', """def CustomTest(context): def userAction(target,source,env): |