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.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3599 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py
index 3201e0138ea3a3d0bddf561862841b5e73e0a0e1..e5e15d0d7cf78a00cd34793024374f4721c93044 100644 (file)
--- a/src/engine/SCons/Tool/latex.py
+++ b/src/engine/SCons/Tool/latex.py
@@ -64,10 +64,8 @@ def generate(env):
     bld = env['BUILDERS']['DVI']
     bld.add_action('.ltx', LaTeXAuxAction)
     bld.add_action('.latex', LaTeXAuxAction)
-    bld.add_action('.tex', LaTeXAuxAction)
     bld.add_emitter('.ltx', SCons.Tool.tex.tex_eps_emitter)
     bld.add_emitter('.latex', SCons.Tool.tex.tex_eps_emitter)
-    bld.add_emitter('.tex', SCons.Tool.tex.tex_eps_emitter)
 
     env['LATEX']        = 'latex'
     env['LATEXFLAGS']   = SCons.Util.CLVar('-interaction=nonstopmode')

diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py
index 241ed49faa4565ae8d75f45c02783d00cdd7deed..010fa11c4ab2bd46e2948ccd8614ace73afd4a0c 100644 (file)
--- a/src/engine/SCons/Tool/pdflatex.py
+++ b/src/engine/SCons/Tool/pdflatex.py
@@ -63,10 +63,8 @@ def generate(env):
     bld = env['BUILDERS']['PDF']
     bld.add_action('.ltx', PDFLaTeXAuxAction)
     bld.add_action('.latex', PDFLaTeXAuxAction)
-    bld.add_action('.tex', PDFLaTeXAuxAction)
     bld.add_emitter('.ltx', SCons.Tool.tex.tex_pdf_emitter)
     bld.add_emitter('.latex', SCons.Tool.tex.tex_pdf_emitter)
-    bld.add_emitter('.tex', SCons.Tool.tex.tex_pdf_emitter)
 
     env['PDFLATEX']      = 'pdflatex'
     env['PDFLATEXFLAGS'] = SCons.Util.CLVar('-interaction=nonstopmode')

diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index 01d14657a68a1641406c119e8ec52763ab61f9b9..aa41663a95d42cdeab30ff917a2e54ce3c8d469c 100644 (file)
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -52,8 +52,9 @@ if not dvips or not latex:
 test.subdir(['docs'])
 
 test.write(['SConstruct'], """\
+import os
 env = Environment(tools = ['pdftex', 'dvipdf', 'dvips', 'tex', 'latex'],
-                  ENV = {},
+                  ENV = {'PATH' : os.environ['PATH']},
                   BUILD_DIR = '#build/docs')
 
 # Use 'duplicate=1' because LaTeX toolchain does not work properly for

diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py
index 6949a319516a665c5a8a7ad2d2a0a465845216c1..a1943c0fc2d0e07e6c8f64382f3ac7b936fcbf0c 100644 (file)
--- a/test/TEX/bibliography.py
+++ b/test/TEX/bibliography.py
@@ -44,7 +44,8 @@ if not dvips or not bibtex:
     test.skip_test("Could not find dvips or bibtex; skipping test(s).\n")
 
 test.write('SConstruct', """\
-env = Environment(tools = ['tex', 'latex', 'dvips'])
+import os
+env = Environment(tools = ['tex', 'latex', 'dvips'],ENV = {'PATH' : os.environ['PATH']})
 env.PostScript('simple', 'simple.tex')
 """)
 

diff --git a/test/TEX/bibtex-latex-rerun.py b/test/TEX/bibtex-latex-rerun.py
index bd1fd3b700fa8e1f6170a1cbc37f0f5fe84c0516..c82e4ead67edf8f4a3fba4d82587fdab24fde503 100644 (file)
--- a/test/TEX/bibtex-latex-rerun.py
+++ b/test/TEX/bibtex-latex-rerun.py
@@ -42,7 +42,8 @@ if not pdflatex:
     test.skip_test("Could not find pdflatex; skipping test(s).\n")
 
 test.write(['SConstruct'], """\
-env = Environment(tools=['pdftex', 'tex'])
+import os
+env = Environment(tools=['pdftex', 'tex'],ENV = {'PATH' : os.environ['PATH']})
 env.PDF( 'bibtest.tex' )
 """)
 

diff --git a/test/TEX/clean.py b/test/TEX/clean.py
index 6615fc9d134e506d9dc182ab5e211152e2e3bfae..499cf5b3110dd93de13a16471af6c0db2bd59ac1 100644 (file)
--- a/test/TEX/clean.py
+++ b/test/TEX/clean.py
@@ -67,7 +67,10 @@ bibfile = r"""
 """
 
 test.write('SConstruct', """\
-DVI( "foo.ltx" )
+import os
+env = Environment(tools = ['tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.DVI( "foo.ltx" )
 """)
 
 test.write('foo.ltx', input_file)

diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py
index 8f992843f0eb00d3e7b6fb6d4dc6a86fc2fbed53..765ef4db9a033e662c0a34cd2498eb4c72b2f461 100644 (file)
--- a/test/TEX/makeindex.py
+++ b/test/TEX/makeindex.py
@@ -44,8 +44,11 @@ if not pdflatex or not makeindex:
     test.skip_test("Could not find pdflatex or makeindex; skipping test(s).\n")
 
 test.write('SConstruct', """\
-PDF( "no_index.tex" )
-PDF( "simple.tex" )
+import os
+env = Environment(tools = ['pdftex', 'dvipdf', 'tex', 'latex'],
+                  ENV = {'PATH' : os.environ['PATH']})
+env.PDF( "no_index.tex" )
+env.PDF( "simple.tex" )
 """)
 
 test.write('no_index.tex', r"""

diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py
index 686263d8cf2f1b0fed578365b422caf9435c14ad..2659e16bb82f56356ed769bf5cb709182bf957dd 100644 (file)
--- 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)
 

diff --git a/test/TEX/subdir-input.py b/test/TEX/subdir-input.py
index d16ba5fc34f368a9443bb3fb487c28ab7cadc9a4..a0bb7ee3b32fbef507f5c84475b47c7eac9ee38f 100644 (file)
--- a/test/TEX/subdir-input.py
+++ b/test/TEX/subdir-input.py
@@ -49,7 +49,8 @@ if not pdflatex:
 test.subdir('sub')
 
 test.write('SConstruct', """\
-env = Environment(TOOLS = ['tex', 'pdftex'])
+import os
+env = Environment(TOOLS = ['tex', 'pdftex'], ENV = {'PATH' : os.environ['PATH']})
 env.PDF( 'sub/x.tex' )
 env.DVI( 'sub/x.tex' )
 """)

diff --git a/test/TEX/subdir_variantdir_input.py b/test/TEX/subdir_variantdir_input.py
index 1229032c5809e5473a3706da50b4315b9ae94837..b6633594cd27a59bdc8ad8f3582fd2b4c972b283 100644 (file)
--- a/test/TEX/subdir_variantdir_input.py
+++ b/test/TEX/subdir_variantdir_input.py
@@ -52,7 +52,8 @@ test.subdir('docs')
 test.subdir(['docs','sub'])
 
 test.write('SConstruct', """\
-env = Environment(TOOLS = ['tex', 'pdftex'])
+import os
+env = Environment(TOOLS = ['tex', 'pdftex'],ENV = {'PATH' : os.environ['PATH']})
 
 env.VariantDir('build', 'docs',duplicate=0)
 env.SConscript('build/SConscript', exports = ['env'])