summaryrefslogtreecommitdiffstats
path: root/test/M4/M4.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-11-28 16:53:37 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-11-28 16:53:37 (GMT)
commit694e80ea463c655d2e011afd4fe35109c119d6e7 (patch)
tree566428089b48f80bab14789ec4e3d77b8d003477 /test/M4/M4.py
parent1c19e9f962b8cab0f9086615bb6409f8a326c0b8 (diff)
downloadSCons-694e80ea463c655d2e011afd4fe35109c119d6e7.zip
SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.gz
SCons-694e80ea463c655d2e011afd4fe35109c119d6e7.tar.bz2
Fix tests failing on win32 AR and Fortran and M4
Diffstat (limited to 'test/M4/M4.py')
-rw-r--r--test/M4/M4.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/M4/M4.py b/test/M4/M4.py
index 4306558..76010e6 100644
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -59,7 +59,13 @@ line 3
test.run()
-test.must_match(test.workpath('aaa.x'), "line 1\nmym4.py\nline 3\n")
+import sys
+
+if sys.platform == 'win32':
+ # Handle carriage returns.
+ test.must_match(test.workpath('aaa.x'), "line 1\r\nmym4.py\r\nline 3\r\n")
+else:
+ test.must_match(test.workpath('aaa.x'), "line 1\nmym4.py\nline 3\n")