diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 19:26:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 19:26:29 (GMT) |
| commit | 6a8d296df3061825d119fbc1561e7222953ac3ba (patch) | |
| tree | f3d8405612688d845b2db5b9b16867dc91579f72 /tests/place.test | |
| parent | 723b4258800e248dad36092b2f9a27ca2ec9afa6 (diff) | |
| parent | 5bdd278d66f4ea89994c76013f0e52f7662f1cc4 (diff) | |
| download | tk-6a8d296df3061825d119fbc1561e7222953ac3ba.zip tk-6a8d296df3061825d119fbc1561e7222953ac3ba.tar.gz tk-6a8d296df3061825d119fbc1561e7222953ac3ba.tar.bz2 | |
Merge trunk
Diffstat (limited to 'tests/place.test')
| -rw-r--r-- | tests/place.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/place.test b/tests/place.test index 3e8f7c0..e60b706 100644 --- a/tests/place.test +++ b/tests/place.test @@ -14,6 +14,7 @@ tcltest::loadTestedCommands testConstraint memory [llength [info commands memory]] testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}] +testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }] # XXX - This test file is woefully incomplete. At present, only a # few of the features are tested. @@ -269,7 +270,7 @@ if {[tk windowingsystem] == "win32"} { } } -test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints failsOnUbuntu -setup { +test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup { place forget .t.f2 place forget .t.f } -body { @@ -285,7 +286,7 @@ test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints placeUpdate lappend result [winfo ismapped .t.f2] } -result {1 0 40 30 0 1} -test place-8.2 {PlaceStructureProc, mapping and unmapping content} -constraints failsOnUbuntu -setup { +test place-8.2 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup { place forget .t.f2 place forget .t.f update idletasks |