From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 20 Sep 2008 01:05:46 +0000 (+0000)
Subject: Windows portability:  use os.path.join() for expected subdirectory paths.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2303fc38a48c44b29697f876dde58d541600788b;p=scons.git

Windows portability:  use os.path.join() for expected subdirectory paths.


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

diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index ca854b2c..5fa936fb 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -2402,7 +2402,12 @@ class GlobTestCase(_tempdirTestCase):
         # At least sometimes this should return out-of-order items
         # if Glob doesn't sort.
         g = self.fs.Glob('disk-sub/*', strings=True)
-        assert g == ['disk-sub/disk-ddd', 'disk-sub/disk-eee', 'disk-sub/disk-fff'], str(g) + " is not sorted, but should be!"
+        expect = [
+            os.path.join('disk-sub', 'disk-ddd'),
+            os.path.join('disk-sub', 'disk-eee'),
+            os.path.join('disk-sub', 'disk-fff'),
+        ]
+        assert g == expect, str(g) + " is not sorted, but should be!"
 
 
 class RepositoryTestCase(_tempdirTestCase):