Testing on a Mac turned up a problem that did not show up on linux.

SK and I agree that we are surprised by that.

Both bld = env['BUILDERS']['PDF'] and bld = env['BUILDERS']['DVI'] had
lines like
bld.add_action('.tex', LaTeXAuxAction)  # for DVI
bld.add_action('.tex', PDFLaTeXAuxAction) # for PDF
run from the initialization of two tools. This was a BAD thing.

That cured some test failures. For the rest I made all the TEX tests
initialize the environment with the os.environ PATH since the check
for the existence of the tools with where_is that looks on the system path.

So the tests still quietly exit if the tool is not on the system path
and now find if it is in a non-standard location like I have.

1 files changed, 23 insertions, 8 deletions

diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py
index 686263d..2659e16 100644
--- a/test/TEX/multi-run.py
+++ b/test/TEX/multi-run.py
@@ -136,8 +136,11 @@ bibfile = r"""
 if tex:
 
     test.write(['work1', 'SConstruct'], """\
-DVI( "foo.tex" )
-PDF( "foo.tex" )
+import os
+env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo.tex" )
+env.PDF( "foo.tex" )
 """)
 
     test.write(['work1', 'foo.tex'], input_file)
@@ -154,7 +157,10 @@ PDF( "foo.tex" )
         test.fail_test(1)
 
     test.write(['work3', 'SConstruct'], """\
-DVI( "foo3.tex" )
+import os
+env = Environment(tools = ['tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo3.tex" )
 """)
 
     test.write(['work3', 'foo3.tex'], input_file3)
@@ -172,8 +178,11 @@ DVI( "foo3.tex" )
 if latex:
 
     test.write(['work2', 'SConstruct'], """\
-DVI( "foo.ltx" )
-PDF( "foo.ltx" )
+import os
+env = Environment(tools = ['dvi', 'pdf', 'pdftex', 'dvipdf', 'pdflatex', 'tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo.ltx" )
+env.PDF( "foo.ltx" )
 """)
 
     test.write(['work2', 'foo.ltx'], input_file)
@@ -190,8 +199,11 @@ PDF( "foo.ltx" )
         test.fail_test(1)
 
     test.write(['work3', 'SConstruct'], """\
-DVI( "foo3.tex" )
-PDF( "foo3.tex" )
+import os
+env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo3.tex" )
+env.PDF( "foo3.tex" )
 """)
 
     test.write(['work3', 'foo3.tex'], input_file3)
@@ -206,7 +218,10 @@ PDF( "foo3.tex" )
 
 
     test.write(['work4', 'SConstruct'], """\
-DVI( "foo.ltx" )
+import os
+env = Environment(tools = ['tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo.ltx" )
 """)
     test.write(['work4', 'foo.ltx'], input_file2)