Fix the tests that broke from the tool auto-detect stuff. (Anthony Roach and SK)

18 files changed, 33 insertions, 19 deletions

diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index 5c04686..c5eb6cb 100644
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -46,7 +46,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LEX = r'%s mylex.py')
+env = Environment(LEX = r'%s mylex.py', tools = ['lex'])
 env.CFile(target = 'foo', source = 'foo.l')
 env.Copy(CFILESUFFIX = '.xyz').CFile(target = 'bar', source = 'bar.l')
 """ % python)
diff --git a/test/CXXFILESUFFIX.py b/test/CXXFILESUFFIX.py
index 48c62a9..e158240 100644
--- a/test/CXXFILESUFFIX.py
+++ b/test/CXXFILESUFFIX.py
@@ -46,7 +46,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LEX = r'%s mylex.py')
+env = Environment(LEX = r'%s mylex.py', tools = ['lex'])
 env.CXXFile(target = 'foo', source = 'foo.ll')
 env.Copy(CXXFILESUFFIX = '.xyz').CXXFile(target = 'bar', source = 'bar.ll')
 """ % python)
diff --git a/test/DVIPDF.py b/test/DVIPDF.py
index 25856dc..26b6b94 100644
--- a/test/DVIPDF.py
+++ b/test/DVIPDF.py
@@ -74,7 +74,8 @@ sys.exit(0)
 test.write('SConstruct', """
 env = Environment(TEX = r'%s mytex.py',
                   LATEX = r'%s mylatex.py',
-                  DVIPDF = r'%s mydvipdf.py')
+                  DVIPDF = r'%s mydvipdf.py',
+                  tools=['latex', 'tex', 'dvipdf'])
 dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
 env.DVI(target = 'test2.dvi', source = 'test2.tex')
 env.PDF(target = 'test1.pdf', source = dvi)
diff --git a/test/DVIPDFFLAGS.py b/test/DVIPDFFLAGS.py
index 9962253..1548360 100644
--- a/test/DVIPDFFLAGS.py
+++ b/test/DVIPDFFLAGS.py
@@ -80,7 +80,8 @@ sys.exit(0)
 test.write('SConstruct', """
 env = Environment(TEX = r'%s mytex.py',
                   LATEX = r'%s mylatex.py',
-                  DVIPDF = r'%s mydvipdf.py', DVIPDFFLAGS = '-x')
+                  DVIPDF = r'%s mydvipdf.py', DVIPDFFLAGS = '-x',
+                  tools = ['tex', 'latex', 'dvipdf'])
 dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
 env.DVI(target = 'test2.dvi', source = 'test2.tex')
 env.PDF(target = 'test1.pdf', source = dvi)
diff --git a/test/DVIPS.py b/test/DVIPS.py
index b3bdebc..9cb6d5f 100644
--- a/test/DVIPS.py
+++ b/test/DVIPS.py
@@ -74,7 +74,8 @@ sys.exit(0)
 test.write('SConstruct', """
 env = Environment(TEX = r'%s mytex.py',
                   LATEX = r'%s mylatex.py',
-                  DVIPS = r'%s mydvips.py')
+                  DVIPS = r'%s mydvips.py',
+                  tools=['tex', 'latex', 'dvips'])
 dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
 env.PostScript(target = 'test1.ps', source = dvi)
 env.PostScript(target = 'test2.ps', source = 'test2.tex')
diff --git a/test/DVIPSFLAGS.py b/test/DVIPSFLAGS.py
index 664b532..a67a058 100644
--- a/test/DVIPSFLAGS.py
+++ b/test/DVIPSFLAGS.py
@@ -81,7 +81,8 @@ sys.exit(0)
 test.write('SConstruct', """
 env = Environment(TEX = r'%s mytex.py',
                   LATEX = r'%s mylatex.py',
-                  DVIPS = r'%s mydvips.py', DVIPSFLAGS = '-x')
+                  DVIPS = r'%s mydvips.py', DVIPSFLAGS = '-x',
+                  tools=['tex', 'latex', 'dvips'])
 dvi = env.DVI(target = 'test1.dvi', source = 'test1.tex')
 env.PostScript(target = 'test1.ps', source = dvi)
 env.PostScript(target = 'test2.ps', source = 'test2.tex')
diff --git a/test/LATEX.py b/test/LATEX.py
index 440054d..7aa8187 100644
--- a/test/LATEX.py
+++ b/test/LATEX.py
@@ -49,7 +49,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LATEX = r'%s mylatex.py')
+env = Environment(LATEX = r'%s mylatex.py', tools=['latex'])
 env.DVI(target = 'test1.dvi', source = 'test1.ltx')
 env.DVI(target = 'test2.dvi', source = 'test2.latex')
 """ % python)
diff --git a/test/LATEXFLAGS.py b/test/LATEXFLAGS.py
index 5ad4d95..a441934 100644
--- a/test/LATEXFLAGS.py
+++ b/test/LATEXFLAGS.py
@@ -55,7 +55,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LATEX = r'%s mylatex.py', LATEXFLAGS = '-x')
+env = Environment(LATEX = r'%s mylatex.py', LATEXFLAGS = '-x', tools=['latex'])
 env.DVI(target = 'test1.dvi', source = 'test1.ltx')
 env.Copy(LATEXFLAGS = '-t').DVI(target = 'test2.dvi', source = 'test2.latex')
 """ % python)
diff --git a/test/LEX.py b/test/LEX.py
index 88c0a2d..28cbdec 100644
--- a/test/LEX.py
+++ b/test/LEX.py
@@ -53,7 +53,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LEX = r'%s mylex.py')
+env = Environment(LEX = r'%s mylex.py', tools=['default', 'lex'])
 env.Program(target = 'aaa', source = 'aaa.l')
 """ % python)
 
diff --git a/test/LEXFLAGS.py b/test/LEXFLAGS.py
index e807774..169ae80 100644
--- a/test/LEXFLAGS.py
+++ b/test/LEXFLAGS.py
@@ -56,7 +56,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(LEX = r'%s mylex.py', LEXFLAGS = '-x')
+env = Environment(LEX = r'%s mylex.py', LEXFLAGS = '-x', tools=['default', 'lex'])
 env.Program(target = 'aaa', source = 'aaa.l')
 """ % python)
 
diff --git a/test/PDFLATEX.py b/test/PDFLATEX.py
index f665d0f..b49ac89 100644
--- a/test/PDFLATEX.py
+++ b/test/PDFLATEX.py
@@ -49,7 +49,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(PDFLATEX = r'%s mypdflatex.py')
+env = Environment(PDFLATEX = r'%s mypdflatex.py', tools=['pdflatex'])
 env.PDF(target = 'test1.pdf', source = 'test1.ltx')
 env.PDF(target = 'test2.pdf', source = 'test2.latex')
 """ % python)
diff --git a/test/PDFLATEXFLAGS.py b/test/PDFLATEXFLAGS.py
index 6ddd41a..67e1627 100644
--- a/test/PDFLATEXFLAGS.py
+++ b/test/PDFLATEXFLAGS.py
@@ -55,7 +55,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(PDFLATEX = r'%s mypdflatex.py', PDFLATEXFLAGS = '-x')
+env = Environment(PDFLATEX = r'%s mypdflatex.py', PDFLATEXFLAGS = '-x', tools=['pdflatex'])
 env.PDF(target = 'test1.pdf', source = 'test1.ltx')
 env.Copy(PDFLATEXFLAGS = '-t').PDF(target = 'test2.pdf', source = 'test2.latex')
 """ % python)
diff --git a/test/PDFTEX.py b/test/PDFTEX.py
index 4fe5341..47fdc9d 100644
--- a/test/PDFTEX.py
+++ b/test/PDFTEX.py
@@ -49,7 +49,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(PDFTEX = r'%s mypdftex.py')
+env = Environment(PDFTEX = r'%s mypdftex.py', tools=['pdftex'])
 env.PDF(target = 'test.pdf', source = 'test.tex')
 """ % python)
 
diff --git a/test/PDFTEXFLAGS.py b/test/PDFTEXFLAGS.py
index aa5cc9f..34647df 100644
--- a/test/PDFTEXFLAGS.py
+++ b/test/PDFTEXFLAGS.py
@@ -55,7 +55,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(PDFTEX = r'%s mypdftex.py', PDFTEXFLAGS = '-x')
+env = Environment(PDFTEX = r'%s mypdftex.py', PDFTEXFLAGS = '-x', tools=['pdftex'])
 env.PDF(target = 'test.pdf', source = 'test.tex')
 """ % python)
 
diff --git a/test/TEX.py b/test/TEX.py
index bcdd62e..a5f981e 100644
--- a/test/TEX.py
+++ b/test/TEX.py
@@ -49,7 +49,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(TEX = r'%s mytex.py')
+env = Environment(TEX = r'%s mytex.py', tools=['tex'])
 env.DVI(target = 'test.dvi', source = 'test.tex')
 """ % python)
 
diff --git a/test/TEXFLAGS.py b/test/TEXFLAGS.py
index 1f7121f..075750c 100644
--- a/test/TEXFLAGS.py
+++ b/test/TEXFLAGS.py
@@ -55,7 +55,7 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(TEX = r'%s mytex.py', TEXFLAGS = '-x')
+env = Environment(TEX = r'%s mytex.py', TEXFLAGS = '-x', tools=['tex'])
 env.DVI(target = 'test.dvi', source = 'test.tex')
 """ % python)
 
diff --git a/test/YACC.py b/test/YACC.py
index 2868085..1df8cc5 100644
--- a/test/YACC.py
+++ b/test/YACC.py
@@ -34,8 +34,12 @@ python = sys.executable
 
 if sys.platform == 'win32':
     _exe = '.exe'
+    compiler = 'msvc'
+    linker = 'mslink'
 else:
     _exe = ''
+    compiler = 'gcc'
+    linker = 'gnulink'
 
 test = TestSCons.TestSCons()
 
@@ -58,8 +62,10 @@ output.close()
 sys.exit(0)
 """)
 
+
+
 test.write('SConstruct', """
-env = Environment(YACC = r'%s myyacc.py')
+env = Environment(YACC = r'%s myyacc.py', tools=['default', 'yacc'])
 env.Program(target = 'aaa', source = 'aaa.y')
 """ % python)
 
diff --git a/test/YACCFLAGS.py b/test/YACCFLAGS.py
index 288696b..ba38209 100644
--- a/test/YACCFLAGS.py
+++ b/test/YACCFLAGS.py
@@ -34,8 +34,12 @@ python = sys.executable
 
 if sys.platform == 'win32':
     _exe = '.exe'
+    compiler = 'msvc'
+    linker = 'mslink'
 else:
     _exe = ''
+    compiler = 'gcc'
+    linker = 'gnulink'
 
 test = TestSCons.TestSCons()
 
@@ -59,9 +63,9 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-env = Environment(YACC = r'%s myyacc.py', YACCFLAGS = '-x')
+env = Environment(YACC = r'%s myyacc.py', YACCFLAGS = '-x', tools=['yacc', '%s', '%s'])
 env.Program(target = 'aaa', source = 'aaa.y')
-""" % python)
+""" % (python, linker, compiler))
 
 test.write('aaa.y', r"""
 int