Plumb through name in ValueWithMemo

3 files changed, 6 insertions, 1 deletions

diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index f3779c7..0cb8418 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -3289,6 +3289,10 @@ def generate(env):
         v3 = env.Value('c', 'build-c')
         assert v3.value == 'c', v3.value
 
+        v4 = env.Value(b'\x00\x0F', name='name')
+        assert v4.value == b'\x00\x0F', v4.value
+        assert v4.name == 'name', v4.name
+
 
     def test_Environment_global_variable(self):
         """Test setting Environment variable to an Environment.Base subclass"""
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index 8437385..d26c185 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -200,7 +200,7 @@ def ValueWithMemo(value, built_value=None, name=None):
     try:
         return _memo_lookup_map[memo_lookup_key]
     except KeyError:
-        v = Value(value)
+        v = Value(value, built_value, name)
         _memo_lookup_map[memo_lookup_key] = v
         return v
 
diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py
index 302bb59..6db07ab 100644
--- a/src/engine/SCons/Node/PythonTests.py
+++ b/src/engine/SCons/Node/PythonTests.py
@@ -67,6 +67,7 @@ class ValueTestCase(unittest.TestCase):
         v3 = SCons.Node.Python.Value(b'\x00\x0F', name='name')
         v3.executor = fake_executor()
         v3.build()
+        assert v3.name == 'name', v3.name
         assert v3.built_value == 'faked', v3.built_value
 
     def test_read(self):