diff options
| author | Steven Knight <knight@baldmt.com> | 2004-04-14 13:43:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-04-14 13:43:32 (GMT) |
| commit | e1989d22646b003f44677f43f9e2ddbbafd0ba62 (patch) | |
| tree | 59ae71809d6fa17570cbb9c56cfec9034e93e4aa /test | |
| parent | 73f9a42aaa603934e51ffb10bc256e9a3c17cd9b (diff) | |
| download | SCons-e1989d22646b003f44677f43f9e2ddbbafd0ba62.zip SCons-e1989d22646b003f44677f43f9e2ddbbafd0ba62.tar.gz SCons-e1989d22646b003f44677f43f9e2ddbbafd0ba62.tar.bz2 | |
Filter null values from the _concat() list. (Chad Austin)
Diffstat (limited to 'test')
| -rw-r--r-- | test/LIBS.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/LIBS.py b/test/LIBS.py index 645c625..c91e38d 100644 --- a/test/LIBS.py +++ b/test/LIBS.py @@ -42,6 +42,7 @@ foo1_exe = test.workpath('foo1' + _exe) foo2_exe = test.workpath('foo2' + _exe) foo3_exe = test.workpath('foo3' + _exe) foo4_exe = test.workpath('foo4' + _exe) +foo5_exe = test.workpath('foo5' + _exe) test.write('SConstruct', """ env = Environment(LIBS=['bar'], LIBPATH = '.') @@ -52,6 +53,8 @@ env3 = Environment(LIBS='bar', LIBPATH = '.') env3.Program(target='foo3', source='foo3.c') env4 = Environment(LIBS=File(r'%s'), LIBPATH = '.') env4.Program(target='foo4', source='foo4.c') +env5 = Environment(LIBS=['bar', '$UNSPECIFIED'], LIBPATH = '.') +env5.Program(target='foo5', source='foo5.c') SConscript('sub1/SConscript', 'env') SConscript('sub2/SConscript', 'env') """ % (bar_lib, bar_lib)) @@ -84,6 +87,7 @@ test.write('foo1.c', foo_contents) test.write('foo2.c', foo_contents) test.write('foo3.c', foo_contents) test.write('foo4.c', foo_contents) +test.write('foo5.c', foo_contents) test.write(['sub1', 'bar.c'], r""" #include <stdio.h> @@ -112,12 +116,14 @@ void baz() } """) -test.run(arguments = '.') +# ar sometimes produces a "warning" on stderr -- ar: creating sub1/libbar.a +test.run(arguments = '.', stderr=None) test.run(program=foo1_exe, stdout='sub1/bar.c\nsub1/baz.c\n') test.run(program=foo2_exe, stdout='sub1/bar.c\nsub1/baz.c\n') test.run(program=foo3_exe, stdout='sub1/bar.c\nsub1/baz.c\n') test.run(program=foo4_exe, stdout='sub1/bar.c\nsub1/baz.c\n') +test.run(program=foo5_exe, stdout='sub1/bar.c\nsub1/baz.c\n') # test.write('SConstruct', """ |