From 8cf5f6ebb0f0258c78d7fc4fe43fefae92d58c83 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 14 Mar 2006 05:01:48 +0000 Subject: * tests/constraints.tcl: Added notAqua constraint to canvPs-3.1 * tests/canvPs.test: to stop test suite crash on Mac OSX. [Bug 1088807] --- ChangeLog | 14 +++++++++----- tests/canvPs.test | 4 +++- tests/constraints.tcl | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4953c1f..0bbc27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,14 @@ 006-03-13 Don Porter - * generic/tkCmds.c: Purged remaining references to - * macosx/tkMacOSXPort.h: errno, and errno.h. Standardized - * macosx/tkMacOSXWm.c: the logic for using header files from - * macosx/tkMacOSXWm.h: the compat directory. Thanks Joe - * unix/tkUnixPort.h: English for the patch. [Patch 1445404] + * tests/constraints.tcl: Added notAqua constraint to canvPs-3.1 + * tests/canvPs.test: to stop test suite crash on Mac OSX. + [Bug 1088807] + + * generic/tkCmds.c: Purged remaining references to + * macosx/tkMacOSXPort.h: errno, and errno.h. Standardized + * macosx/tkMacOSXWm.c: the logic for using header files from + * macosx/tkMacOSXWm.h: the compat directory. Thanks Joe + * unix/tkUnixPort.h: English for the patch. [Patch 1445404] 2006-03-08 Don Porter diff --git a/tests/canvPs.test b/tests/canvPs.test index 74287d0..68c3b68 100644 --- a/tests/canvPs.test +++ b/tests/canvPs.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: canvPs.test,v 1.11 2005/10/12 09:29:21 dkf Exp $ +# RCS: @(#) $Id: canvPs.test,v 1.12 2006/03/14 05:01:48 dgp Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -132,6 +132,8 @@ test canvPs-2.4 {test writing to channel and file, same output} -constraints { test canvPs-3.1 {test ps generation with an embedded window} -setup { set bar [makeFile {} bar.ps] file delete $bar +} -constraints { + notAqua } -body { destroy .c pack [canvas .c -width 200 -height 200 -background white] diff --git a/tests/constraints.tcl b/tests/constraints.tcl index db1aa88..19013ec 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -145,6 +145,7 @@ namespace import -force tk::test::* namespace import -force tcltest::testConstraint +testConstraint userInteraction [expr {[tk windowingsystem] ne "aqua"}] testConstraint userInteraction 0 testConstraint nonUnixUserInteraction [expr { [testConstraint userInteraction] || [testConstraint unix] -- cgit v0.12