Merge core-8-branch

2 files changed, 3 insertions, 5 deletions

diff --git a/tests/safe-zipfs.test b/tests/safe-zipfs.test
index f67bc43..ba6fe50 100644
--- a/tests/safe-zipfs.test
+++ b/tests/safe-zipfs.test
@@ -51,11 +51,6 @@ proc mapAndSortList {map listIn} {
 # thus un-autoindexed) APIs in this test result arguments:
 catch {safe::interpConfigure}
 
-# testing that nested and statics do what is advertised (we use a
-# package - tcl::test - but it might be absent if we're in standard tclsh)
-
-testConstraint tcl::test [expr {![catch {package require tcl::test}]}]
-
 # Tests 5.* test the example files before using them to test safe interpreters.
 
 test safe-zipfs-5.1 {example tclIndex commands, test in parent interpreter; zipfs} -setup {
diff --git a/tests/util.test b/tests/util.test
index f610762..c3b9f2d 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -215,6 +215,9 @@ test util-4.7 {Tcl_ConcatObj - refCount safety} testconcatobj {
     # symptoms was Bug #2055782.
     testconcatobj
 } {}
+test util-4.8 {Tcl_ConcatObj - [Bug 26649439c7]} {
+    concat [list foo] [list #]
+} {foo {#}}
 
 proc Wrapper_Tcl_StringMatch {pattern string} {
     # Forces use of Tcl_StringMatch, not Tcl_UniCharCaseMatch