M4 test portability. (Chad Austin)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@745 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 33e481de8a34525dfaa849996d3b05f6db3ff857..4810df63237b3752453ea3e309d606c9591f32de 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -20,6 +20,8 @@ RELEASE 0.XX - XXX
   - Add a DefaultEnvironment() function that only creates a default
     environment on-demand (for fetching source files, e.g.).
 
+  - Portability fix for test/M4.py.
+
   From Steven Knight:
 
   - Tighten up the scons -H help output.

diff --git a/test/M4.py b/test/M4.py
index 0e7e809a55c88e648cb244e118a7e9558f44c7cc..cc3554084f7f825f6b3fb06d19b810c39cf20ea2 100644 (file)
--- a/test/M4.py
+++ b/test/M4.py
@@ -99,8 +99,8 @@ bar.M4(target = 'bar', source = 'bar.m4')
 
     test.fail_test(test.read('wrapper.out') != "wrapper.py\n")
 
-    test.fail_test(test.read('foo.x') != "line 1\nfff\nline 3\n")
+    test.fail_test(test.read('foo.x', 'r') != "line 1\nfff\nline 3\n")
 
-    test.fail_test(test.read('bar') != "line 1\nbbb\nline 3\n")
+    test.fail_test(test.read('bar', 'r') != "line 1\nbbb\nline 3\n")
 
 test.pass_test()