Issue 2390: Support appending to $*FLAGS values (CLVar instances) in a

copied construction environment without also affecting the value in
the original construction environment.  (Matt Hughes)

1 files changed, 14 insertions, 0 deletions

diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index ec69607..7feb76d 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -1806,6 +1806,20 @@ def exists(env):
         env2.Append(FLAGS = 'flag3 flag4')
         x = env2.get('FLAGS')
         assert x == ['flag1', 'flag2', 'flag3', 'flag4'], x
+        x = env1.get('FLAGS')
+        assert x == ['flag1', 'flag2'], x
+
+        # Ensure that appending directly to a copied CLVar
+        # doesn't modify the original.
+        env1 = self.TestEnvironment(FLAGS = CLVar('flag1 flag2'))
+        x = env1.get('FLAGS')
+        assert x == ['flag1', 'flag2'], x
+        env2 = env1.Clone()
+        env2['FLAGS'] += ['flag3', 'flag4']
+        x = env2.get('FLAGS')
+        assert x == ['flag1', 'flag2', 'flag3', 'flag4'], x
+        x = env1.get('FLAGS')
+        assert x == ['flag1', 'flag2'], x
 
         # Test that the environment stores the toolpath and
         # re-uses it for copies.