Better test for use of Configure() in nested SConscript files..

git-svn-id: http://scons.tigris.org/svn/scons/trunk@874 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/Configure.py b/test/Configure.py
index 6d024f2e7bf83a3b1c3b8de7683c1ec3f7821e7f..d3a8db735f7893e96ff0b88cd2685f9a04a0b701 100644 (file)
--- 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)