summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2023-01-13 13:08:53 -0700
committerMats Wichmann <mats@linux.com>2023-01-13 13:08:53 -0700
commit511282de0cbb82bd931681b7ca8a6c83755af4d9 (patch)
tree905f8246bca320cbdad662b43bfca9d7b523408e
parent854c3bdd06e995ceadceccc7d99f773e80cb9707 (diff)
downloadscons-git-511282de0cbb82bd931681b7ca8a6c83755af4d9.tar.gz
Remove unneeded code in new Java test
java inner class cache teest: String didn't need to interpolate from locals() as there were no variables to fill in. Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--CHANGES.txt7
-rw-r--r--test/Java/inner-cacheable-live.py4
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 087464b3d..32e1e5b8f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -98,9 +98,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
over 2100 lines.
- Add a zipapp package of scons-local: can use SCons from a local
file which does not need unpacking.
- - Fix a problem (4.4 only) where a Java inner class could not be cached
- because the emitted filename contained a '$' and ended up generating
- a Python SyntaxError because is was passed through scons_subst().
+ - Fix a problem (present in 4.4.0 only) where a Java inner class could
+ not be cached because the emitted filename contained a '$' and when
+ looked up through a node ended up generating a Python SyntaxError
+ because it was passed through scons_subst().
RELEASE 4.4.0 - Sat, 30 Jul 2022 14:08:29 -0700
diff --git a/test/Java/inner-cacheable-live.py b/test/Java/inner-cacheable-live.py
index 9f70291e0..e0391d2f7 100644
--- a/test/Java/inner-cacheable-live.py
+++ b/test/Java/inner-cacheable-live.py
@@ -50,11 +50,11 @@ if test.javac_is_gcj:
test.write(
'SConstruct',
"""
+DefaultEnvironment(tools=[])
env = Environment()
env.CacheDir("cache")
env.Java("classes", "source")
-"""
- % locals(),
+""",
)
test.subdir('source')