Fix the use of Configure() contexts in nested subsidiary SConscript files. (Jon Rafkind)

1 files changed, 57 insertions, 0 deletions

diff --git a/test/Configure/from-SConscripts.py b/test/Configure/from-SConscripts.py
new file mode 100644
index 00000000..42cd3d29
--- /dev/null
+++ b/test/Configure/from-SConscripts.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Make sure we can call Configure() from subsidiary SConscript calls.
+
+This was broken at one point when we were using the internal
+sconscript_reading flag (which is basically a hint for whether or not
+we're in a Builder call) as a semaphore, not a counter.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """\
+env = SConscript('x.scons')
+""")
+
+test.write('x.scons', """\
+env = SConscript('y.scons')
+config = env.Configure()
+env = config.Finish()
+Return('env')
+""")
+
+test.write('y.scons', """\
+env = Environment()
+Return('env')
+""")
+
+test.run(arguments = '.')
+
+test.pass_test()