From 0cbfc6064d65ab72fd5b06021b23ea5ae4faa28d Mon Sep 17 00:00:00 2001 From: vincentdarley Date: Tue, 18 Apr 2006 22:33:03 +0000 Subject: fix tests for TkAqua --- ChangeLog | 4 ++++ tests/constraints.tcl | 1 + tests/wm.test | 7 +++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe19908..ef301e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * macosx/tkMacOSXEmbed.c: fix to [Bug 1088814] test failures in embed.test + * macosx/tkMacOSXWm.c: + * tests/constraints.tcl: + * tests/wm.test: fix to 'wm attributes' test for TkAqua + 2006-04-11 Peter Spjuth * generic/tkWindow.c (Tk_NameToWindow): Allow NULL interp to diff --git a/tests/constraints.tcl b/tests/constraints.tcl index 6219004..3b786d9 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -145,6 +145,7 @@ 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 userInteraction 0 testConstraint nonUnixUserInteraction [expr { [testConstraint userInteraction] || [testConstraint unix] diff --git a/tests/wm.test b/tests/wm.test index 99e6b76..28afbd6 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -7,7 +7,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: wm.test,v 1.35 2006/04/05 20:54:27 hobbs Exp $ +# RCS: @(#) $Id: wm.test,v 1.36 2006/04/18 22:33:03 vincentdarley Exp $ # This file tests window manager interactions that work across # platforms. Window manager tests that only work on a specific @@ -127,9 +127,12 @@ test wm-attributes-1.2.3 {usage} win { # not critical. list [catch {wm attributes . -to} err] $err } {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-disabled ?bool?? ?-fullscreen ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}} -test wm-attributes-1.2.4 {usage} unix { +test wm-attributes-1.2.4 {usage} {unix notAqua} { list [catch {wm attributes . _} err] $err } {1 {bad attribute "_": must be -alpha, -topmost, -zoomed, or -fullscreen}} +test wm-attributes-1.2.5 {usage} aqua { + list [catch {wm attributes . _} err] $err +} {1 {bad attribute "_": must be -alpha, -modified, -notify, or -titlepath}} ### wm client ### -- cgit v0.12