Fix bugs in regression tests

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

diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
index ef35069165a4f3cf1b6e7ff0cd99af5265e9573c..37449e8214738d5f9406381a6ce49a34b11f4816 100644 (file)
--- a/test/Glob/glob-libpath.py
+++ b/test/Glob/glob-libpath.py
@@ -73,7 +73,7 @@ libutil = base_env.Library('util', Glob('*.cpp'))
 Return('libutil')
 """)
 
-test.write(['src', 'util.cpp'], """int i=0;
+test.write(['src', 'util', 'util.cpp'], """int i=0;
 """)
 
 test.run(arguments = '-Q .')

diff --git a/test/TEX/configure.py b/test/TEX/configure.py
index 9a6b80ba113190571d2d30e8515aa68b9e66645e..23e317c44eb34a09effe42e0d3191ceb7e0b6593 100644 (file)
--- a/test/TEX/configure.py
+++ b/test/TEX/configure.py
@@ -37,6 +37,12 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
+dvips = test.where_is('dvips')
+latex = test.where_is('latex')
+
+if not dvips or not latex:
+    test.skip_test("Could not find dvips or latex; skipping test(s).\n")
+
 NCR = test.NCR  # non-cached rebuild
 
 #----------------