From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Fri, 19 Sep 2008 15:46:55 +0000 (+0000)
Subject: Windows portability in the expected output.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7931fa485be2e55083574fa321a9b052a63af808;p=scons.git

Windows portability in the expected output.


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

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()