diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-20 01:05:46 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-20 01:05:46 (GMT) |
| commit | 4edc63a976399fc771c2e86a7c8fa2e420676185 (patch) | |
| tree | 597ae9b0ea12d466be1eaa0896ba0a2347d6f1b5 /src/engine | |
| parent | 0981328e8845515903fe0f14a098d3a786e9dd70 (diff) | |
| download | SCons-4edc63a976399fc771c2e86a7c8fa2e420676185.zip SCons-4edc63a976399fc771c2e86a7c8fa2e420676185.tar.gz SCons-4edc63a976399fc771c2e86a7c8fa2e420676185.tar.bz2 | |
Windows portability: use os.path.join() for expected subdirectory paths.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Node/FSTests.py | 7 |
1 files changed, 6 insertions, 1 deletions
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): |