summaryrefslogtreecommitdiff
path: root/test/Glob
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-09-19 15:46:55 +0000
committerSteven Knight <knight@baldmt.com>2008-09-19 15:46:55 +0000
commitd232f0f85ca0e4fdfa961f5575010b528cbc0c31 (patch)
tree9d75f4ad86445c793dee01dece739aa406cc2824 /test/Glob
parentfe54165109f49eaacb2882a2cc2b0d801b1f1cf7 (diff)
downloadscons-d232f0f85ca0e4fdfa961f5575010b528cbc0c31.tar.gz
Windows portability in the expected output.
Diffstat (limited to 'test/Glob')
-rw-r--r--test/Glob/glob-libpath.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
index 37449e82..fb16fca0 100644
--- a/test/Glob/glob-libpath.py
+++ b/test/Glob/glob-libpath.py
@@ -77,11 +77,11 @@ test.write(['src', 'util', 'util.cpp'], """int i=0;
""")
test.run(arguments = '-Q .')
-if not test.match_re_dotall(test.stdout(), r".*-Lbuild/util.*"):
- print repr(test.stdout())+" should contain -Lbuild/util"
+if not test.match_re_dotall(test.stdout(), r".*(-L|/LIBPATH:)build[/\\]util.*"):
+ print repr(test.stdout())+" should contain -Lbuild/util or /LIBPATH:build\\util"
test.fail_test()
-if test.match_re_dotall(test.stdout(), r".*-Lsrc/util.*"):
- print repr(test.stdout())+" should not contain -Lsrc/util"
+if test.match_re_dotall(test.stdout(), r".*(-L|/LIBPATH:)src[/\\]util.*"):
+ print repr(test.stdout())+" should not contain -Lsrc/util or /LIBPATH:src\\util"
test.fail_test()
test.pass_test()