summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-02-05 17:44:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-02-05 17:44:34 (GMT)
commit5e0ccea47993ed0c38eb6d8b5b2d134dea29c55e (patch)
treecf24d154f023ca48a7ede5738ca161c7ada9f153
parentd52304ef37cf777a3f7f435d6a7b0fdd937e7234 (diff)
downloadtk-5e0ccea47993ed0c38eb6d8b5b2d134dea29c55e.zip
tk-5e0ccea47993ed0c38eb6d8b5b2d134dea29c55e.tar.gz
tk-5e0ccea47993ed0c38eb6d8b5b2d134dea29c55e.tar.bz2
Restore failing tests to passing.
-rw-r--r--tests/bitmap.test6
-rw-r--r--tests/border.test6
-rw-r--r--tests/cursor.test6
-rw-r--r--tests/font.test6
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 80bc114..6e2573f 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -85,11 +85,11 @@ test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} -constraints {
test bitmap-4.1 {FreeBitmapObjProc} -constraints {
testbitmap
} -body {
- set x [format questhead]
+ set x [join questhead]
button .b -bitmap $x
- set y [format questhead]
+ set y [join questhead]
.b configure -bitmap $y
- set z [format questhead]
+ set z [join questhead]
.b configure -bitmap $z
set result {}
lappend result [testbitmap questhead]
diff --git a/tests/border.test b/tests/border.test
index 78d0fcd..981e640 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -132,11 +132,11 @@ test border-3.1 {FreeBorderObjProc} -constraints {
} -setup {
set result {}
} -body {
- set x [format purple]
+ set x [join purple]
button .b -bg $x -text .b1
- set y [format purple]
+ set y [join purple]
.b configure -bg $y
- set z [format purple]
+ set z [join purple]
.b configure -bg $z
lappend result [testborder purple]
set x red
diff --git a/tests/cursor.test b/tests/cursor.test
index 1039b52..ab7949e 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -145,11 +145,11 @@ test cursor-3.1 {Tk_FreeCursorFromObj - reference counts} -constraints {
test cursor-4.1 {FreeCursorObjProc} -constraints {
testcursor
} -body {
- set x [format heart]
+ set x [join heart]
button .b -cursor $x
- set y [format heart]
+ set y [join heart]
.b configure -cursor $y
- set z [format heart]
+ set z [join heart]
.b configure -cursor $z
set result {}
lappend result [testcursor heart]
diff --git a/tests/font.test b/tests/font.test
index 33986af..33e411a 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -798,11 +798,11 @@ test font-18.1 {FreeFontObjProc} -constraints testfont -setup {
destroy .b1
set result {}
} -body {
- set x [format {Courier 12}]
+ set x [join {Courier 12} { }]
button .b1 -font $x
- set y [format {Courier 12}]
+ set y [join {Courier 12} { }]
.b1 configure -font $y
- set z [format {Courier 12}]
+ set z [join {Courier 12} { }]
.b1 configure -font $z
lappend result [testfont counts {Courier 12}]
set x red