Win32 portability for tests.

2 files changed, 28 insertions, 10 deletions

diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py
index cc6929a..a95b181 100644
--- a/test/PRINT_CMD_LINE_FUNC.py
+++ b/test/PRINT_CMD_LINE_FUNC.py
@@ -28,10 +28,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the PRINT_CMD_LINE_FUNC construction variable.
 """
 
+import string
 import sys
 import TestCmd
 import TestSCons
 
+_exe = TestSCons._exe
+_obj = TestSCons._obj
+
 test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 
@@ -49,10 +53,21 @@ test.write('prog.c', r"""
 int main(int argc, char *argv[]) { return 0; }
 """)
 
-test.run(arguments = '-Q .', stdout = """\
-BUILDING prog.o from prog.c with .*
-BUILDING prog from prog.o with .*
-""")
+test.run(arguments = '-Q .')
+
+expected_lines = [
+    "BUILDING prog%s from prog.c with" % (_obj,),
+    "BUILDING prog%s from prog%s with" % (_exe, _obj),
+]
+
+missing_lines = filter(lambda l: string.find(test.stdout(), l) == -1,
+                       expected_lines)
+if missing_lines:
+    print "Expected the following lines in STDOUT:"
+    print "\t" + string.join(expected_lines, "\n\t")
+    print "ACTUAL STDOUT =========="
+    print test.stdout()
+    test.fail_test(1)
 
 test.run(arguments = '-c .')
 
diff --git a/test/QTFLAGS.py b/test/QTFLAGS.py
index a07c2c6..f9cb917 100644
--- a/test/QTFLAGS.py
+++ b/test/QTFLAGS.py
@@ -244,14 +244,17 @@ env1 = Environment(tools=['qt'],
                    QT_LIBPATH='$QTDIR/lib64',
                    QT_CPPPATH='$QTDIR/h64')
 
-if not env1.subst('$CPPPATH') == os.path.join(r'%(QTDIR)s', 'h64'):
-    print env1.subst('$CPPPATH')
+cpppath = env1.subst('$CPPPATH')
+if os.path.normpath(cpppath) != os.path.join(r'%(QTDIR)s', 'h64'):
+    print cpppath
     Exit(1)
-if not env1.subst('$LIBPATH') == os.path.join(r'%(QTDIR)s', 'lib64'):
-    print env1.subst('$LIBPATH')
+libpath = env1.subst('$LIBPATH')
+if os.path.normpath(libpath) != os.path.join(r'%(QTDIR)s', 'lib64'):
+    print libpath
     Exit(2)
-if not env1.subst('$QT_MOC') == os.path.join(r'%(QTDIR)s', 'bin64', 'moc'):
-    print env1.subst('$QT_MOC')
+qt_moc = env1.subst('$QT_MOC')
+if os.path.normpath(qt_moc) != os.path.join(r'%(QTDIR)s', 'bin64', 'moc'):
+    print qt_moc
     Exit(3)
 
 env2 = Environment(tools=['default', 'qt'],