diff options
| author | Steven Knight <knight@baldmt.com> | 2008-03-31 19:49:37 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-03-31 19:49:37 (GMT) |
| commit | bb1c936e7669cdf489087ae33989c97ee560169a (patch) | |
| tree | ed8516e05c6e335415c8993f18f5c98b1458dc69 /src/engine | |
| parent | 0012fb93592da7bef839ec5ed26ee6ec731d7d86 (diff) | |
| download | SCons-bb1c936e7669cdf489087ae33989c97ee560169a.zip SCons-bb1c936e7669cdf489087ae33989c97ee560169a.tar.gz SCons-bb1c936e7669cdf489087ae33989c97ee560169a.tar.bz2 | |
Merged revisions 2720-2724 via svnmerge from0.98.0
http://scons.tigris.org/svn/scons/branches/core
........
r2722 | stevenknight | 2008-03-31 11:51:25 -0700 (Mon, 31 Mar 2008) | 2 lines
Update the copyright year.
........
r2723 | stevenknight | 2008-03-31 11:56:25 -0700 (Mon, 31 Mar 2008) | 2 lines
Windows portability fixes in tests (mostly with absolute path handling).
........
r2724 | stevenknight | 2008-03-31 12:44:37 -0700 (Mon, 31 Mar 2008) | 2 lines
Update publication month (way out of date).
........
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 6c10ee0..4f48da9 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -3317,13 +3317,13 @@ def generate(env): def test_parse_flags(self): '''Test the Base class parse_flags argument''' # all we have to show is that it gets to MergeFlags internally - env = Environment(parse_flags = '-X') + env = Environment(tools=[], parse_flags = '-X') assert env['CCFLAGS'] == ['-X'], env['CCFLAGS'] - env = Environment(CCFLAGS=None, parse_flags = '-Y') + env = Environment(tools=[], CCFLAGS=None, parse_flags = '-Y') assert env['CCFLAGS'] == ['-Y'], env['CCFLAGS'] - env = Environment(CPPDEFINES = 'FOO', parse_flags = '-std=c99 -X -DBAR') + env = Environment(tools=[], CPPDEFINES = 'FOO', parse_flags = '-std=c99 -X -DBAR') assert env['CFLAGS'] == ['-std=c99'], env['CFLAGS'] assert env['CCFLAGS'] == ['-X'], env['CCFLAGS'] assert env['CPPDEFINES'] == ['FOO', 'BAR'], env['CPPDEFINES'] |