Windows portability fixes in various tests. Fix runtest.py detection

of non-zero exit status on systems that don't have os.WEXITSTATUS().

1 files changed, 7 insertions, 1 deletions

diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index 7bf6b2d6..4702b7eb 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -34,7 +34,8 @@ import re
 import TestCmd
 import TestRuntest
 
-test = TestRuntest.TestRuntest(match = TestCmd.match_re)
+test = TestRuntest.TestRuntest(match = TestCmd.match_re,
+                               diff = TestCmd.diff_re)
 
 pythonstring = re.escape(TestRuntest.pythonstring)
 test_fail_py = re.escape(os.path.join('test', 'fail.py'))
@@ -89,6 +90,11 @@ expect = """\
   </results>
 """ % locals()
 
+# Just strip carriage returns so the regular expression matching works.
+contents = test.read('xml.out')
+contents = contents.replace('\r', '')
+test.write('xml.out', contents)
+
 test.must_match('xml.out', expect)
 
 test.pass_test()