diff options
| author | Steven Knight <knight@baldmt.com> | 2004-01-10 12:47:07 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-01-10 12:47:07 (GMT) |
| commit | 58d722532fa83041c28b6ae6836cb731d9ec8e55 (patch) | |
| tree | b3383ec9b73b85fe8daede28fb41c8c2cafe7570 /test/Configure.py | |
| parent | a2ca9333b07ac0c2509ebe8266d76d6a2fc95663 (diff) | |
| download | SCons-58d722532fa83041c28b6ae6836cb731d9ec8e55.zip SCons-58d722532fa83041c28b6ae6836cb731d9ec8e55.tar.gz SCons-58d722532fa83041c28b6ae6836cb731d9ec8e55.tar.bz2 | |
Better test for use of Configure() in nested SConscript files..
Diffstat (limited to 'test/Configure.py')
| -rw-r--r-- | test/Configure.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/test/Configure.py b/test/Configure.py index 6d024f2..d3a8db7 100644 --- a/test/Configure.py +++ b/test/Configure.py @@ -386,10 +386,13 @@ env.MyAction('target', []) test.run(chdir=work_dir, status=2, stderr="scons: *** Calling Configure from Builders is not supported.\n") - # 4.3 test the calling Configure from multiple subsidiary - # SConscript files does *not* result in an error. + # 4.3 test the calling Configure from multiple subsidiary, + # nested SConscript files does *not* result in an error. - test.subdir([work_dir, 'dir1'], [work_dir, 'dir2']) + test.subdir([work_dir, 'dir1'], + [work_dir, 'dir2'], + [work_dir, 'dir2', 'sub1'], + [work_dir, 'dir2', 'sub1', 'sub2']) test.write([work_dir, 'SConstruct'], """ env = Environment() SConscript(dirs=['dir1', 'dir2'], exports="env") @@ -403,6 +406,18 @@ conf.Finish() Import("env") conf = env.Configure() conf.Finish() +SConscript(dirs=['sub1'], exports="env") +""") + test.write([work_dir, 'dir2', 'sub1', 'SConscript'], """ +Import("env") +conf = env.Configure() +conf.Finish() +SConscript(dirs=['sub2'], exports="env") +""") + test.write([work_dir, 'dir2', 'sub1', 'sub2', 'SConscript'], """ +Import("env") +conf = env.Configure() +conf.Finish() """) test.run(chdir=work_dir) |