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 | a2ba55e47988f6d7e602f558e08feef219be934e (patch) | |
| tree | c1504d1d0c2dfd118c24c1920e28a037c932ed02 /test/ParseConfig.py | |
| parent | e966ff8d4b3581dc6194adfb70718445a0bbb41b (diff) | |
| download | SCons-a2ba55e47988f6d7e602f558e08feef219be934e.zip SCons-a2ba55e47988f6d7e602f558e08feef219be934e.tar.gz SCons-a2ba55e47988f6d7e602f558e08feef219be934e.tar.bz2 | |
Allow to contain File Nodes. Have ParseConfig add libraries to . Add support for -framework. (Gary Oberbrunner)
Diffstat (limited to 'test/ParseConfig.py')
| -rw-r--r-- | test/ParseConfig.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/test/ParseConfig.py b/test/ParseConfig.py index 108aa31..7e31a17 100644 --- a/test/ParseConfig.py +++ b/test/ParseConfig.py @@ -33,6 +33,9 @@ test = TestSCons.TestSCons() test_config = test.workpath('test-config') +# 'abc' is supposed to be a static lib; it is included in LIBS as a +# File node. +# It used to be returned as the 'static_libs' output of ParseConfig. test.write('test-config', """#! /usr/bin/env python print "-I/usr/include/fum -Ibar -X" print "-L/usr/fax -Lfoo -lxxx abc" @@ -40,41 +43,37 @@ print "-L/usr/fax -Lfoo -lxxx abc" test.write('SConstruct', """ env = Environment(CPPPATH = [], LIBPATH = [], LIBS = [], CCFLAGS = '') -static_libs = env.ParseConfig([r"%s", r"%s", "--libs --cflags"]) +env.ParseConfig([r"%s", r"%s", "--libs --cflags"]) print env['CPPPATH'] print env['LIBPATH'] -print env['LIBS'] +print map(lambda x: str(x), env['LIBS']) print env['CCFLAGS'] -print static_libs """ % (TestSCons.python, test_config)) test.write('SConstruct2', """ env = Environment(CPPPATH = [], LIBPATH = [], LIBS = [], CCFLAGS = '', PYTHON = '%s') -static_libs = env.ParseConfig(r"$PYTHON %s --libs --cflags") +env.ParseConfig(r"$PYTHON %s --libs --cflags") print env['CPPPATH'] print env['LIBPATH'] -print env['LIBS'] +print map(lambda x: str(x), env['LIBS']) print env['CCFLAGS'] -print static_libs """ % (TestSCons.python, test_config)) test.write('SConstruct3', """ env = Environment(CPPPATH = [], LIBPATH = [], LIBS = [], CCFLAGS = '') -static_libs = ParseConfig(env, r"%s %s --libs --cflags") +ParseConfig(env, r"%s %s --libs --cflags") print env['CPPPATH'] print env['LIBPATH'] -print env['LIBS'] +print map(lambda x: str(x), env['LIBS']) print env['CCFLAGS'] -print static_libs """ % (TestSCons.python, test_config)) good_stdout = test.wrap_stdout(read_str = """\ ['/usr/include/fum', 'bar'] ['/usr/fax', 'foo'] -['xxx'] +['xxx', 'abc'] ['-X'] -['abc'] """, build_str = "scons: `.' is up to date.\n") test.run(arguments = ".", stdout = good_stdout) |