diff options
author | Steven Knight <knight@baldmt.com> | 2004-07-21 13:06:51 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2004-07-21 13:06:51 (GMT) |
commit | d3d871ea2d2e4b0730cb56c66ac0f77e259ae671 (patch) | |
tree | a01ab0baf376aa963ea113ae295c483215f411d7 /src/engine/SCons/Node/FSTests.py | |
parent | 502bdb0f465217b1b34bfd53cbf32385e40bdce5 (diff) | |
download | SCons-d3d871ea2d2e4b0730cb56c66ac0f77e259ae671.zip SCons-d3d871ea2d2e4b0730cb56c66ac0f77e259ae671.tar.gz SCons-d3d871ea2d2e4b0730cb56c66ac0f77e259ae671.tar.bz2 |
Add a .win32 attribute for FS entries; preserve Literal() attributes when concatenating strings in subst_list(). (Chris Murray)
Diffstat (limited to 'src/engine/SCons/Node/FSTests.py')
-rw-r--r-- | src/engine/SCons/Node/FSTests.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index 231d736..4a868b9 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -1522,7 +1522,6 @@ class prepareTestCase(unittest.TestCase): assert dir_made == [], dir_made xyz.set_state(0) xyz.prepare() - print "dir_made[0] =", dir_made[0] assert dir_made[0].path == "new_dir", dir_made[0] dir = fs.Dir("dir") @@ -1836,6 +1835,13 @@ class SpecialAttrTestCase(unittest.TestCase): for_sig = f.posix.for_signature() assert for_sig == 'baz.blat_posix', for_sig + s = str(f.win32) + assert s == 'foo\\bar\\baz.blat', repr(s) + assert f.win32.is_literal(), f.win32 + if f.win32 != f: + for_sig = f.win32.for_signature() + assert for_sig == 'baz.blat_win32', for_sig + # And now, combinations!!! s = str(f.srcpath.base) assert s == os.path.normpath('foo/bar/baz'), s @@ -1843,6 +1849,8 @@ class SpecialAttrTestCase(unittest.TestCase): assert s == str(f.srcdir), s s = str(f.srcpath.posix) assert s == 'foo/bar/baz.blat', s + s = str(f.srcpath.win32) + assert s == 'foo\\bar\\baz.blat', s # Test what happens with BuildDir() fs.BuildDir('foo', 'baz') |