Fix bitmap-4.1, color-4.1 and cursor-4.1 by cherrypicking the fix [ae13ed65] from trunk. Ticket [ad98f10b3a] dealt with trunk only, the problem appears to be seen in core-8-6-branch as well when running this Tk branch with core-8-branch of Tcl, on Linux Debian 8 at least.

1 files changed, 6 insertions, 3 deletions

diff --git a/tests/bitmap.test b/tests/bitmap.test
index 6e2573f..fea675d 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -84,12 +84,14 @@ test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} -constraints {
 
 test bitmap-4.1 {FreeBitmapObjProc} -constraints {
     testbitmap
+} -setup {
+    proc copy {s} {return [string index $s 0][string range $s 1 end]}
 } -body {
-    set x [join questhead]
+    set x [copy questhead]
     button .b -bitmap $x
-    set y [join questhead]
+    set y [copy questhead]
     .b configure -bitmap $y
-    set z [join questhead]
+    set z [copy questhead]
     .b configure -bitmap $z
     set result {}
     lappend result [testbitmap questhead]
@@ -102,6 +104,7 @@ test bitmap-4.1 {FreeBitmapObjProc} -constraints {
     set y bogus
     return $result
 } -cleanup {
+    rename copy {}
     destroy .b
 } -result {{{1 3}} {{1 2}} {{1 1}} {}}