summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-01-06 14:14:21 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-01-06 14:14:21 (GMT)
commitc20a3010587a7f5b2488d01ec10021f70eb92a8b (patch)
treea3b0d0e04cbe96379e18335ce59a0a7b9569f678
parent3ae3e292d3d381885989cdaa6d121a7ae8d658a9 (diff)
downloadtk-c20a3010587a7f5b2488d01ec10021f70eb92a8b.zip
tk-c20a3010587a7f5b2488d01ec10021f70eb92a8b.tar.gz
tk-c20a3010587a7f5b2488d01ec10021f70eb92a8b.tar.bz2
Better fix for [c12af74765]: OS X - text-21.1 failsbug_c12af74765
-rw-r--r--tests/constraints.tcl4
-rw-r--r--tests/text.test19
2 files changed, 6 insertions, 17 deletions
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index e0486ff..a87499d 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -180,7 +180,11 @@ namespace import -force tk::test::*
namespace import -force tcltest::testConstraint
testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}]
testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}]
+testConstraint x11 [expr {[tk windowingsystem] eq "x11"}]
testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}]
+testConstraint aquaOrWin32 [expr {
+ ([tk windowingsystem] eq "win32") || [testConstraint aqua]
+}]
testConstraint userInteraction 0
testConstraint nonUnixUserInteraction [expr {
[testConstraint userInteraction] ||
diff --git a/tests/text.test b/tests/text.test
index 9d9b836..6812855 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -3925,7 +3925,7 @@ test text-20.5 {TextFetchSelection procedure, long selections} -setup {
} -result {1}
-test text-21.1 {TkTextLostSelection procedure} -constraints {unix notAqua} -setup {
+test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
text .t
.t insert 1.0 "Line 1"
entry .t.e
@@ -3940,22 +3940,7 @@ test text-21.1 {TkTextLostSelection procedure} -constraints {unix notAqua} -setu
} -cleanup {
destroy .t .t2
} -result {}
-test text-21.1a {TkTextLostSelection procedure} -constraints {unix aqua} -setup {
- text .t
- .t insert 1.0 "Line 1"
- entry .t.e
- .t.e insert end "abcdefg"
- text .t2
- .t2 insert 1.0 "abc\ndef\nghijk\n1234"
-} -body {
- .t2 tag add sel 1.2 3.3
- .t.e select from 0
- .t.e select to 1
- .t2 tag ranges sel
-} -cleanup {
- destroy .t .t2
-} -result {1.2 3.3}
-test text-21.2 {TkTextLostSelection procedure} -constraints win -setup {
+test text-21.2 {TkTextLostSelection procedure} -constraints aquaOrWin32 -setup {
text .t
.t insert 1.0 "Line 1"
entry .t.e