diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
commit | 089a364ffa502039ae4d42853857206dbeddc250 (patch) | |
tree | 4701b3aff5e43914b137d6bc202f02192bc0c9c0 /tests/place.test | |
parent | 611539b46b3f35feff024c8e9c22b8bf93a025d8 (diff) | |
parent | 10bca5a542048ae2e11701980f2997e26ce28433 (diff) | |
download | tk-089a364ffa502039ae4d42853857206dbeddc250.zip tk-089a364ffa502039ae4d42853857206dbeddc250.tar.gz tk-089a364ffa502039ae4d42853857206dbeddc250.tar.bz2 |
Merge 8.6
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 3da19f6..4bf9689 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 |