summaryrefslogtreecommitdiff
path: root/test/CPPFLAGS.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-03-21 05:37:23 +0000
committerSteven Knight <knight@baldmt.com>2004-03-21 05:37:23 +0000
commitbfbe139e5a5fd96dfa0319768ad9a0088a5e7e78 (patch)
tree0791cbe6a928ce401cf2e4361bee39cef7688e95 /test/CPPFLAGS.py
parent726790558e9e9b22ec0897ceeae5b83144197fe5 (diff)
downloadscons-bfbe139e5a5fd96dfa0319768ad9a0088a5e7e78.tar.gz
Cygwin portability fixes. (Chad Austin) Improved testing infrastructure.
Diffstat (limited to 'test/CPPFLAGS.py')
-rw-r--r--test/CPPFLAGS.py34
1 files changed, 16 insertions, 18 deletions
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 87f5603b..357a2413 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -128,15 +128,14 @@ test.write('test3.F', r"""test3.F
test.run(arguments = '.', stderr=None)
-test.fail_test(test.read('test1' + _obj) != "test1.c\n#link\n")
-
-test.fail_test(test.read('test2' + _obj) != "test2.cpp\n#link\n")
-
-test.fail_test(test.read('test3' + _obj) != "test3.F\n#link\n")
-
-test.fail_test(test.read('foo' + _exe) != "test1.c\ntest2.cpp\ntest3.F\n")
-
-test.fail_test(test.read('mygcc.out') != "cc\nc++\ng77\n")
+test.must_match('test1' + _obj, "test1.c\n#link\n")
+test.must_match('test2' + _obj, "test2.cpp\n#link\n")
+test.must_match('test3' + _obj, "test3.F\n#link\n")
+test.must_match('foo' + _exe, "test1.c\ntest2.cpp\ntest3.F\n")
+if TestSCons.case_sensitive_suffixes('.F', '.f'):
+ test.must_match('mygcc.out', "cc\nc++\ng77\n")
+else:
+ test.must_match('mygcc.out', "cc\nc++\n")
test.write('SConstruct', """
env = Environment(CPPFLAGS = '-x',
@@ -172,14 +171,13 @@ test.unlink('test3' + _obj)
test.run(arguments = '.', stderr = None)
-test.fail_test(test.read('test1' + _shobj) != "test1.c\n#link\n")
-
-test.fail_test(test.read('test2' + _shobj) != "test2.cpp\n#link\n")
-
-test.fail_test(test.read('test3' + _shobj) != "test3.F\n#link\n")
-
-test.fail_test(test.read('foo.bar') != "test1.c\ntest2.cpp\ntest3.F\n")
-
-test.fail_test(test.read('mygcc.out') != "cc\nc++\ng77\n")
+test.must_match('test1' + _shobj, "test1.c\n#link\n")
+test.must_match('test2' + _shobj, "test2.cpp\n#link\n")
+test.must_match('test3' + _shobj, "test3.F\n#link\n")
+test.must_match('foo.bar', "test1.c\ntest2.cpp\ntest3.F\n")
+if TestSCons.case_sensitive_suffixes('.F', '.f'):
+ test.must_match('mygcc.out', "cc\nc++\ng77\n")
+else:
+ test.must_match('mygcc.out', "cc\nc++\n")
test.pass_test()