summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-11-07 15:44:52 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-11-07 15:44:52 (GMT)
commitcbaf259cc06b8c3d5c35198c24ba1c98592fd14d (patch)
treebce84ac85947b520df2b069bb4e750860e4fd514 /tests
parent640ca4ad25d6efe409faf5551bbb2f4102011e62 (diff)
parent3a984ad1d080d340903f346a5778047d60720cc0 (diff)
downloadtk-cbaf259cc06b8c3d5c35198c24ba1c98592fd14d.zip
tk-cbaf259cc06b8c3d5c35198c24ba1c98592fd14d.tar.gz
tk-cbaf259cc06b8c3d5c35198c24ba1c98592fd14d.tar.bz2
merge trunk
Diffstat (limited to 'tests')
-rw-r--r--tests/canvText.test1
-rw-r--r--tests/scale.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/canvText.test b/tests/canvText.test
index f0c677f..094bfa2 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -873,6 +873,7 @@ test canvText-18.1 {bug fix 2525, find enclosed on text with newlines} -setup {
.c find enclosed 99 99 [expr $x2 + 1] [expr $y2 + 1]
} -cleanup {
destroy .c
+ unset -nocomplain bbox x2 y2
} -result 1
test canvText-19.1 {patch 1006286, leading space caused wrap under Win32} -setup {
diff --git a/tests/scale.test b/tests/scale.test
index 32ce1ff..a8d08a8 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -1366,6 +1366,7 @@ test scale-19 {Bug [3529885fff] - Click in through goes in wrong direction} \
-setup {
catch {destroy .s}
catch {destroy .s1 .s2 .s3 .s4}
+ unset -nocomplain x1 x2 x3 x4 x y
scale .s1 -from 0 -to 100 -resolution 1 -variable x1 -digits 4 -orient horizontal -length 100
scale .s2 -from 0 -to 100 -resolution -1 -variable x2 -digits 4 -orient horizontal -length 100
scale .s3 -from 100 -to 0 -resolution 1 -variable x3 -digits 4 -orient horizontal -length 100