[Boost-commit] svn:boost r83810 - trunk/tools/build/v2/test

Subject: [Boost-commit] svn:boost r83810 - trunk/tools/build/v2/test
From: steven_at_[hidden]
Date: 2013-04-08 11:27:40

Author: steven_watanabe
Date: 2013-04-08 11:27:40 EDT (Mon, 08 Apr 2013)
New Revision: 83810
URL: http://svn.boost.org/trac/boost/changeset/83810

Log:
Try to make path comparison work on Windows.
Text files modified: 
   trunk/tools/build/v2/test/MockToolset.py |    12 ++++++++----                            
   1 files changed, 8 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/test/MockToolset.py
==============================================================================
--- trunk/tools/build/v2/test/MockToolset.py	(original)
+++ trunk/tools/build/v2/test/MockToolset.py	2013-04-08 11:27:40 EDT (Mon, 08 Apr 2013)
@@ -69,21 +69,25 @@
     if options.compile != expected_options.compile:
       return False
 
+    # Normalize a path for comparison purposes
+    def adjust_path(p):
+      return os.path.normcase(os.path.abspath(p))
+
     # order matters
     if options.includes is None:
       options.includes = []
     if expected_options.includes is None:
       expected_options.includes = []
-    if map(os.path.abspath, options.includes) != \
-        map(os.path.abspath, expected_options.includes):
+    if map(adjust_path, options.includes) != \
+        map(adjust_path, expected_options.includes):
       return False
 
     if options.library_path is None:
       options.library_path = []
     if expected_options.library_path is None:
       expected_options.library_path = []
-    if map(os.path.abspath, options.library_path) != \
-        map(os.path.abspath, expected_options.library_path):
+    if map(adjust_path, options.library_path) != \
+        map(adjust_path, expected_options.library_path):
       return False
 
     if options.static_libraries != expected_options.static_libraries: