summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-01-07 15:18:16 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-01-07 15:18:16 (GMT)
commit2aa8148b1c0d4bfd43195800910c9c6eec0ec8a2 (patch)
tree517e948cbfa0afd6352eacb78d9c1909451da877
parent9f76636345a893b9bfe045dbf40de723fb29a011 (diff)
parentc20a3010587a7f5b2488d01ec10021f70eb92a8b (diff)
downloadtk-2aa8148b1c0d4bfd43195800910c9c6eec0ec8a2.zip
tk-2aa8148b1c0d4bfd43195800910c9c6eec0ec8a2.tar.gz
tk-2aa8148b1c0d4bfd43195800910c9c6eec0ec8a2.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 8ba177f..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 -setup {
+test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
text .t
.t insert 1.0 "Line 1"
entry .t.e
@@ -3940,7 +3940,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