summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2006-03-14 04:59:40 (GMT)
committerdgp <dgp@users.sourceforge.net>2006-03-14 04:59:40 (GMT)
commitd017d808d948e99b61e768936fe5fdb903f1cccf (patch)
tree1034afa1e92d0e4fd6fd945094defc77c0172a4b
parent0ac4ecd3e056e2da5ae5e3e2a7c510e723a7f646 (diff)
downloadtk-d017d808d948e99b61e768936fe5fdb903f1cccf.zip
tk-d017d808d948e99b61e768936fe5fdb903f1cccf.tar.gz
tk-d017d808d948e99b61e768936fe5fdb903f1cccf.tar.bz2
* tests/constraints.tcl: Added notAqua constraint to canvPs-3.1
* tests/canvPs.test: to stop test suite crash on Mac OSX. [Bug 1088807]
-rw-r--r--ChangeLog4
-rw-r--r--tests/canvPs.test4
-rw-r--r--tests/constraints.tcl1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f8b1007..1a9b49d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-03-13 Don Porter <dgp@users.sourceforge.net>
+ * 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
diff --git a/tests/canvPs.test b/tests/canvPs.test
index cc0f39b..8f8fffe 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.5.2.1 2003/05/11 00:57:10 hobbs Exp $
+# RCS: @(#) $Id: canvPs.test,v 1.5.2.2 2006/03/14 04:59:44 dgp Exp $
package require tcltest 2.1
namespace import -force tcltest::configure
@@ -94,7 +94,7 @@ test canvPs-2.4 {test writing to channel and file, same output} {pcOnly} {
set status
} ok
-test canvPs-3.1 {test ps generation with an embedded window} {} {
+test canvPs-3.1 {test ps generation with an embedded window} {notAqua} {
removeFile bar.ps
destroy .c
pack [canvas .c -width 200 -height 200 -background white]
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 3006cca..7898250 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -127,6 +127,7 @@ namespace eval tk {
namespace import -force tk::test::*
namespace import -force tcltest::testConstraint
+testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}]
testConstraint userInteraction 0
testConstraint nonUnixUserInteraction [expr {[testConstraint userInteraction]
|| [testConstraint unix]}]