diff options
| author | dgp <dgp@users.sourceforge.net> | 2002-07-15 16:56:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2002-07-15 16:56:31 (GMT) |
| commit | 043de52c9870236b12bc1231eccf35e61b22558c (patch) | |
| tree | 230ae2938c63f2aa5abf5179608344bbe3d77f2a /tests | |
| parent | 2e111650d22e90af7843a8c343a87d136ea8a409 (diff) | |
| download | tk-043de52c9870236b12bc1231eccf35e61b22558c.zip tk-043de52c9870236b12bc1231eccf35e61b22558c.tar.gz tk-043de52c9870236b12bc1231eccf35e61b22558c.tar.bz2 | |
* Fixes for [Bug 581627].
* generic/tkTest.c: Test commands not supported on non-Unix
platforms should not be defined there in the first place.
* tests/constraints.tcl: Fixed "secureserver" constraint.
* tests/unixWm.test: Some tests needed "unix" constraint.
* win/tkWinWm.c: Typo in error message.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/constraints.tcl | 11 | ||||
| -rw-r--r-- | tests/unixWm.test | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 3c28b3a..01ed60d 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -161,10 +161,13 @@ testConstraint pseudocolor8 [expr {([catch { destroy .t setupbg set app [dobg {tk appname}] -testConstraint secureserver 1 -if {[catch {send $app set a 0} msg] == 1} { - if {[string match "X server insecure *" $msg]} { - testConstraint secureserver 0 +testConstraint secureserver 0 +if {[llength [info commands send]]} { + testConstraint secureserver 1 + if {[catch {send $app set a 0} msg] == 1} { + if {[string match "X server insecure *" $msg]} { + testConstraint secureserver 0 + } } } cleanupbg diff --git a/tests/unixWm.test b/tests/unixWm.test index 8c55ac5..e430c84 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: unixWm.test,v 1.23 2002/07/13 21:52:34 dgp Exp $ +# RCS: @(#) $Id: unixWm.test,v 1.24 2002/07/15 16:56:32 dgp Exp $ package require tcltest 2.1 namespace import -force tcltest::configure @@ -789,7 +789,7 @@ test unixWm-21.5 {Tk_WmCmd procedure, "group" option, create leader wrapper} {un set result } {{} 0} -test unixWm-22.1 {Tk_WmCmd procedure, "iconbitmap" option} { +test unixWm-22.1 {Tk_WmCmd procedure, "iconbitmap" option} unix { list [catch {wm iconbitmap .t 12 13} msg] $msg } {1 {wrong # arguments: must be "wm iconbitmap window ?bitmap?"}} test unixWm-22.2 {Tk_WmCmd procedure, "iconbitmap" option} {unix testwrapper} { @@ -1163,7 +1163,7 @@ test unixWm-34.3 {Tk_WmCmd procedure, "sizefrom" option} { list [catch {wm sizefrom .t none} msg] $msg } {1 {bad argument "none": must be program or user}} -test unixWm-35.1 {Tk_WmCmd procedure, "state" option} { +test unixWm-35.1 {Tk_WmCmd procedure, "state" option} unix { list [catch {wm state .t 1} msg] $msg } {1 {bad argument "1": must be normal, iconic or withdrawn}} test unixWm-35.2 {Tk_WmCmd procedure, "state" option} { @@ -2387,12 +2387,12 @@ test unixWm-59.3 {exit processing} { list $error $msg } {0 {}} -test unixWm-60.1 {wm attributes} { +test unixWm-60.1 {wm attributes} unix { destroy .t toplevel .t wm attributes .t } {} -test unixWm-60.2 {wm attributes} { +test unixWm-60.2 {wm attributes} unix { destroy .t toplevel .t list [catch {wm attributes .t -foo} msg] $msg |