From 4edc63a976399fc771c2e86a7c8fa2e420676185 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sat, 20 Sep 2008 01:05:46 +0000 Subject: Windows portability: use os.path.join() for expected subdirectory paths. --- src/engine/SCons/Node/FSTests.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index ca854b2..5fa936f 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): -- cgit v0.12