summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-01-07 15:18:30 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-01-07 15:18:30 (GMT)
commit855e33530a514c6bdd7b663c86d4384c19ccdf2d (patch)
treedbd420c399b4e62ad338801f3679610cd59aefc6
parent9752d4c02d70f2b68c77e174905b4fd3cd995477 (diff)
parent2aa8148b1c0d4bfd43195800910c9c6eec0ec8a2 (diff)
downloadtk-855e33530a514c6bdd7b663c86d4384c19ccdf2d.zip
tk-855e33530a514c6bdd7b663c86d4384c19ccdf2d.tar.gz
tk-855e33530a514c6bdd7b663c86d4384c19ccdf2d.tar.bz2
Fix [c12af74765]: OS X - text-21.1 fails
-rw-r--r--tests/constraints.tcl4
-rw-r--r--tests/text.test4
2 files changed, 6 insertions, 2 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 1beaf55..21ee427 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -3937,7 +3937,7 @@ test text-20.5 {TextFetchSelection procedure, long selections} -setup {
} -result {1}
-test text-21.1 {TkTextLostSelection procedure} -constraints unix -setup {
+test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
text .t
.t insert 1.0 "Line 1"
entry .t.e
@@ -3952,7 +3952,7 @@ test text-21.1 {TkTextLostSelection procedure} -constraints unix -setup {
} -cleanup {
destroy .t .t2
} -result {}
-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