diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-11-28 08:53:37 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-11-28 08:53:37 -0800 |
| commit | c6bad1d59576348df5ba54abe6703c448469cfaf (patch) | |
| tree | 566428089b48f80bab14789ec4e3d77b8d003477 /test/M4 | |
| parent | cfb02848f9cbd9d9cdd5416c84eb1ce34c045506 (diff) | |
| download | scons-c6bad1d59576348df5ba54abe6703c448469cfaf.tar.gz | |
Fix tests failing on win32 AR and Fortran and M4
Diffstat (limited to 'test/M4')
| -rw-r--r-- | test/M4/M4.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/M4/M4.py b/test/M4/M4.py index 4306558f..76010e62 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") |