diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-20 14:51:56 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-20 14:51:56 (GMT) |
| commit | 1e71a52986995de529c97769091ac2bf3e6d77ae (patch) | |
| tree | 067b821ac9069cc87af135c54aceb6bfbb930685 /src/engine/SCons/EnvironmentTests.py | |
| parent | 61bcb77878e7137ceb2881f5b22c8127f5738629 (diff) | |
| download | SCons-1e71a52986995de529c97769091ac2bf3e6d77ae.zip SCons-1e71a52986995de529c97769091ac2bf3e6d77ae.tar.gz SCons-1e71a52986995de529c97769091ac2bf3e6d77ae.tar.bz2 | |
Windows portability: use os.sep instead of hard-coded /.
Diffstat (limited to 'src/engine/SCons/EnvironmentTests.py')
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index fe9ddc8..950dd38 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -3063,32 +3063,36 @@ def generate(env): SCons.SConsign.File = capture env.SConsignFile('foo') - assert fnames[0] == os.path.join(os.sep, 'dir', 'foo'), fnames - assert dbms[0] == None, dbms + assert fnames[-1] == os.path.join(os.sep, 'dir', 'foo'), fnames + assert dbms[-1] == None, dbms env.SConsignFile('$FOO') - assert fnames[1] == os.path.join(os.sep, 'dir', 'SConsign'), fnames - assert dbms[1] == None, dbms + assert fnames[-1] == os.path.join(os.sep, 'dir', 'SConsign'), fnames + assert dbms[-1] == None, dbms env.SConsignFile('/$FOO') - assert fnames[2] == '/SConsign', fnames - assert dbms[2] == None, dbms + assert fnames[-1] == os.sep + 'SConsign', fnames + assert dbms[-1] == None, dbms + + env.SConsignFile(os.sep + '$FOO') + assert fnames[-1] == os.sep + 'SConsign', fnames + assert dbms[-1] == None, dbms env.SConsignFile('$BAR', 'x') - assert fnames[3] == os.path.join(os.sep, 'File'), fnames - assert dbms[3] == 'x', dbms + assert fnames[-1] == os.path.join(os.sep, 'File'), fnames + assert dbms[-1] == 'x', dbms env.SConsignFile('__$BAR', 7) - assert fnames[4] == os.path.join(os.sep, 'dir', '__', 'File'), fnames - assert dbms[4] == 7, dbms + assert fnames[-1] == os.path.join(os.sep, 'dir', '__', 'File'), fnames + assert dbms[-1] == 7, dbms env.SConsignFile() - assert fnames[5] == os.path.join(os.sep, 'dir', '.sconsign'), fnames - assert dbms[5] == None, dbms + assert fnames[-1] == os.path.join(os.sep, 'dir', '.sconsign'), fnames + assert dbms[-1] == None, dbms env.SConsignFile(None) - assert fnames[6] == None, fnames - assert dbms[6] == None, dbms + assert fnames[-1] == None, fnames + assert dbms[-1] == None, dbms finally: SCons.SConsign.File = save_SConsign_File |