Fix on-disk file matching on case-insensitive systems. Various fixes for win32 portability. Refactor the --debug=time test. Refactor the Perforce test. Additional cleanup.

1 files changed, 10 insertions, 2 deletions

diff --git a/test/QT/up-to-date.py b/test/QT/up-to-date.py
index 5ae7cc6..46b9db8 100644
--- a/test/QT/up-to-date.py
+++ b/test/QT/up-to-date.py
@@ -33,10 +33,18 @@ up-to-date after a build.
 ca. September 2005.)
 """
 
+import os
+
 import TestSCons
 
+_obj = TestSCons._obj
+
 test = TestSCons.TestSCons()
 
+if not os.environ.get('QTDIR', None):
+    x ="External environment variable $QTDIR not set; skipping test(s).\n"
+    test.skip_test(x)
+
 test.subdir('layer',
             ['layer', 'aclock'],
             ['layer', 'aclock', 'qt_bug'])
@@ -121,10 +129,10 @@ test.write(['layer', 'aclock', 'qt_bug', 'my.cc'], """\
 #include <main.h>
 """)
 
-test.run(arguments = 'layer/aclock/qt_bug/my.o', stderr=None)
+test.run(arguments = 'layer/aclock/qt_bug/my'+_obj, stderr=None)
 
 test.up_to_date(options = '--debug=explain',
-                arguments = 'layer/aclock/qt_bug/my.o',
+                arguments = 'layer/aclock/qt_bug/my'+_obj,
                 stderr=None)
 
 test.pass_test()