Fix for bug #2184, Glob() corrupts LIBPATH.

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 58550537cbfacbf62383bf5b7b9d2da8148323d8..7045b0fe8f529bdbe74bba57c29ff6c030bb6695 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,13 @@
 
 
 
+RELEASE 1.X - XXX
+
+  From Ian P. Cardenas:
+
+    - Fix Glob() polluting LIBPATH by returning copy of list
+
+
 RELEASE 1.0.0 - XXX
 
   From Jared Grubb:

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 6165873c8509f6e908f66e669a5db220c3772c66..a2c7244000123948ac86e18d453762f4eb8940f4 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1411,7 +1411,7 @@ class Dir(Base):
 
     def get_all_rdirs(self):
         try:
-            return self._memo['get_all_rdirs']
+            return list(self._memo['get_all_rdirs'])
         except KeyError:
             pass
 
@@ -1427,7 +1427,7 @@ class Dir(Base):
                 fname = dir.name + os.sep + fname
             dir = dir.up()
 
-        self._memo['get_all_rdirs'] = result
+        self._memo['get_all_rdirs'] = list(result)
 
         return result
 

diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
new file mode 100644 (file)
index 0000000..ef35069
--- /dev/null
+++ b/test/Glob/glob-libpath.py
@@ -0,0 +1,87 @@
+#!/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__"
+
+"""
+Verify that Glob() in a subdir doesn't corrupt LIBPATH.
+See bug #2184, "Glob pollutes LIBPATH" from Ian P. Cardenas.
+Test output should not contain -Lsrc/util.
+"""
+
+import TestCmd
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('src', ['src', 'util'])
+
+test.write('SConstruct', """\
+base_env = Environment()
+Export('base_env')
+swat = base_env.SConscript('src/SConscript', variant_dir='build')
+Default(swat)
+""")
+
+test.write('SConstruct', """\
+base_env = Environment()
+Export('base_env')
+swat = base_env.SConscript('src/SConscript', variant_dir='build')
+Default(swat)
+""")
+
+test.write(['src', 'SConscript'], """Import('base_env')
+
+libutil = base_env.SConscript('util/SConscript')
+
+env = base_env.Clone()
+env.AppendUnique( LIBPATH = 'util')
+env.AppendUnique( LIBS = libutil )
+
+swat = env.Program( 'main', 'main.cpp' )
+
+Return('swat')
+""")
+
+test.write(['src', 'main.cpp'], """int main(void) { return 0; }
+""")
+
+
+test.write(['src', 'util', 'SConscript'], """Import('base_env')
+libutil = base_env.Library('util', Glob('*.cpp'))
+Return('libutil')
+""")
+
+test.write(['src', 'util.cpp'], """int i=0;
+""")
+
+test.run(arguments = '-Q .')
+if not test.match_re_dotall(test.stdout(), r".*-Lbuild/util.*"):
+    print repr(test.stdout())+" should contain -Lbuild/util"
+    test.fail_test()
+if test.match_re_dotall(test.stdout(), r".*-Lsrc/util.*"):
+    print repr(test.stdout())+" should not contain -Lsrc/util"
+    test.fail_test()
+
+test.pass_test()