diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-01 00:03:16 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-01 00:03:16 (GMT) |
| commit | f8225ea4663cfabdfa7f5b1e85201119a66693d2 (patch) | |
| tree | c1504d1d0c2dfd118c24c1920e28a037c932ed02 /src/engine/SCons/EnvironmentTests.py | |
| parent | a27f1c1d47d6af2122f52f9bc22eae9deb059a1b (diff) | |
| download | SCons-f8225ea4663cfabdfa7f5b1e85201119a66693d2.zip SCons-f8225ea4663cfabdfa7f5b1e85201119a66693d2.tar.gz SCons-f8225ea4663cfabdfa7f5b1e85201119a66693d2.tar.bz2 | |
Allow to contain File Nodes. Have ParseConfig add libraries to . Add support for -framework. (Gary Oberbrunner)
Diffstat (limited to 'src/engine/SCons/EnvironmentTests.py')
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index de09fd7..4839e2a 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -1335,19 +1335,18 @@ class EnvironmentTestCase(unittest.TestCase): def read(self): return "-I/usr/include/fum -Ibar -X\n" + \ "-L/usr/fax -Lfoo -lxxx " + \ - "-Wa,-as -Wl,-link -Wp,-cpp abc -pthread" + "-Wa,-as -Wl,-link -Wp,-cpp abc -pthread -framework Carbon" return fake_file() try: os.popen = my_popen - libs = env.ParseConfig("fake $COMMAND") + env.ParseConfig("fake $COMMAND") assert save_command == ['fake command'], save_command - assert libs == ['abc'], libs assert env['ASFLAGS'] == ['assembler', '-Wa,-as'], env['ASFLAGS'] assert env['CPPPATH'] == ['string', '/usr/include/fum', 'bar'], env['CPPPATH'] assert env['CPPFLAGS'] == ['', '-Wp,-cpp'], env['CPPFLAGS'] assert env['LIBPATH'] == ['list', '/usr/fax', 'foo'], env['LIBPATH'] - assert env['LIBS'] == ['xxx'], env['LIBS'] - assert env['LINKFLAGS'] == ['', '-Wl,-link', '-pthread'], env['LINKFLAGS'] + assert env['LIBS'] == ['xxx', env.File('abc')], env['LIBS'] + assert env['LINKFLAGS'] == ['', '-Wl,-link', '-pthread', '-framework', 'Carbon'], env['LINKFLAGS'] assert env['CCFLAGS'] == ['', '-X', '-pthread'], env['CCFLAGS'] finally: os.popen = orig_popen |