* tests/unixWm.test: Constrained all tests older than revision 1.21

        to run only on Unix.  Alternative approach did not match maintainer
        habits.
        * tests/spinbox.test (spinbox-17.4): Avoid long failure message.

3 files changed, 179 insertions, 171 deletions

diff --git a/ChangeLog b/ChangeLog
index 839778c..72fcfe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-13  Don Porter  <dgp@users.sourceforge.net>
+
+        * tests/unixWm.test:  Constrained all tests older than revision 1.21
+        to run only on Unix.  Alternative approach did not match maintainer
+        habits.
+        * tests/spinbox.test (spinbox-17.4): Avoid long failure message.
+
 2003-03-13  Kevin Kenny  <kennykb@users.sourceforge.net>
 
 	* win/makefile.vc: Backed the version to 8.4 on the 8.4 branch.
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 5881087..e668a70 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -4,7 +4,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: spinbox.test,v 1.5 2003/02/25 00:46:41 hobbs Exp $
+# RCS: @(#) $Id: spinbox.test,v 1.5.2.1 2003/03/13 19:33:48 dgp Exp $
 
 package require tcltest 2.1
 namespace import -force tcltest::configure
@@ -1272,6 +1272,7 @@ test spinbox-17.3 {SpinboxUpdateScrollbar procedure} {
 } {0.315789 0.842105}
 test spinbox-17.4 {SpinboxUpdateScrollbar procedure} {
     destroy .e
+    set x "Background error did not happen"
     proc bgerror msg {
 	global x
 	set x $msg
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 4bb5379..47f1b8d 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.29 2002/11/07 22:27:04 mdejong Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.29.2.1 2003/03/13 19:33:49 dgp Exp $
 
 package require tcltest 2.2
 namespace import -force tcltest::configure
@@ -395,7 +395,7 @@ test unixWm-9.2 {TkWmMapWindow procedure, command property} {unix testwrapper} {
 } {test
 command
 }
-test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} {
+test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} unix {
     catch {destroy .t}
     toplevel .t -width 100 -height 300 -bg blue
     wm geom .t +0+0
@@ -403,7 +403,7 @@ test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} {
     sleep 500
     winfo ismapped .t
 } {0}
-test unixWm-9.4 {TkWmMapWindow procedure, icon windows} {
+test unixWm-9.4 {TkWmMapWindow procedure, icon windows} unix {
     catch {destroy .t}
     sleep 500
     toplevel .t -width 100 -height 50 -bg blue
@@ -411,7 +411,7 @@ test unixWm-9.4 {TkWmMapWindow procedure, icon windows} {
     update
     set result [winfo ismapped .t]
 } {0}
-test unixWm-9.5 {TkWmMapWindow procedure, normal windows} {
+test unixWm-9.5 {TkWmMapWindow procedure, normal windows} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 20
     wm geom .t +0+0
@@ -421,7 +421,7 @@ test unixWm-9.5 {TkWmMapWindow procedure, normal windows} {
 
 testConstraint testmenubar [llength [info commands testmenubar]]
 
-test unixWm-10.1 {TkWmDeadWindow procedure, canceling UpdateGeometry idle handler} {
+test unixWm-10.1 {TkWmDeadWindow procedure, canceling UpdateGeometry idle handler} unix {
     catch {destroy .t}
     toplevel .t -width 100 -height 50
     wm geom .t +0+0
@@ -444,16 +444,16 @@ test unixWm-10.2 {TkWmDeadWindow procedure, destroying menubar} {unix testmenuba
     lappend result [winfo exists .f]
 } {destroyed 0}
 
-test unixWm-11.1 {Tk_WmCmd procedure, miscellaneous errors} {
+test unixWm-11.1 {Tk_WmCmd procedure, miscellaneous errors} unix {
     list [catch {wm} msg] $msg
 } {1 {wrong # args: should be "wm option window ?arg ...?"}}
-test unixWm-11.2 {Tk_WmCmd procedure, miscellaneous errors} {
+test unixWm-11.2 {Tk_WmCmd procedure, miscellaneous errors} unix {
     list [catch {wm aspect} msg] $msg
 } {1 {wrong # args: should be "wm option window ?arg ...?"}}
-test unixWm-11.3 {Tk_WmCmd procedure, miscellaneous errors} {
+test unixWm-11.3 {Tk_WmCmd procedure, miscellaneous errors} unix {
     list [catch {wm iconify bogus} msg] $msg
 } {1 {bad window path name "bogus"}}
-test unixWm-11.4 {Tk_WmCmd procedure, miscellaneous errors} {
+test unixWm-11.4 {Tk_WmCmd procedure, miscellaneous errors} unix {
     catch {destroy .b}
     button .b -text hello
     list [catch {wm geometry .b} msg] $msg
@@ -466,13 +466,13 @@ toplevel .t -width 100 -height 50
 wm geom .t +0+0
 update
 
-test unixWm-12.1 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.1 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 12} msg] $msg
 } {1 {wrong # args: should be "wm aspect window ?minNumer minDenom maxNumer maxDenom?"}}
-test unixWm-12.2 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.2 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 12 13 14 15 16} msg] $msg
 } {1 {wrong # args: should be "wm aspect window ?minNumer minDenom maxNumer maxDenom?"}}
-test unixWm-12.3 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.3 {Tk_WmCmd procedure, "aspect" option} unix {
     set result {}
     lappend result [wm aspect .t]
     wm aspect .t 3 4 10 2
@@ -480,32 +480,32 @@ test unixWm-12.3 {Tk_WmCmd procedure, "aspect" option} {
     wm aspect .t {} {} {} {}
     lappend result [wm aspect .t]
 } {{} {3 4 10 2} {}}
-test unixWm-12.4 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.4 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t bad 14 15 16} msg] $msg
 } {1 {expected integer but got "bad"}}
-test unixWm-12.5 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.5 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 foo 15 16} msg] $msg
 } {1 {expected integer but got "foo"}}
-test unixWm-12.6 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.6 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 14 bar 16} msg] $msg
 } {1 {expected integer but got "bar"}}
-test unixWm-12.7 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.7 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 14 15 baz} msg] $msg
 } {1 {expected integer but got "baz"}}
-test unixWm-12.8 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.8 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 0 14 15 16} msg] $msg
 } {1 {aspect number can't be <= 0}}
-test unixWm-12.9 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.9 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 0 15 16} msg] $msg
 } {1 {aspect number can't be <= 0}}
-test unixWm-12.10 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.10 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 14 0 16} msg] $msg
 } {1 {aspect number can't be <= 0}}
-test unixWm-12.11 {Tk_WmCmd procedure, "aspect" option} {
+test unixWm-12.11 {Tk_WmCmd procedure, "aspect" option} unix {
     list [catch {wm aspect .t 13 14 15 0} msg] $msg
 } {1 {aspect number can't be <= 0}}
 
-test unixWm-13.1 {Tk_WmCmd procedure, "client" option} {
+test unixWm-13.1 {Tk_WmCmd procedure, "client" option} unix {
     list [catch {wm client .t x y} msg] $msg
 } {1 {wrong # args: should be "wm client window ?name?"}}
 test unixWm-13.2 {Tk_WmCmd procedure, "client" option} {unix testwrapper} {
@@ -518,7 +518,7 @@ test unixWm-13.2 {Tk_WmCmd procedure, "client" option} {unix testwrapper} {
     wm client .t {}
     lappend result [wm client .t] [testprop [testwrapper .t] WM_CLIENT_MACHINE]
 } {{} Test_String New {} {}}
-test unixWm-13.3 {Tk_WmCmd procedure, "client" option, unmapped window} {
+test unixWm-13.3 {Tk_WmCmd procedure, "client" option, unmapped window} unix {
     catch {destroy .t2}
     toplevel .t2
     wm client .t2 Test_String
@@ -527,10 +527,10 @@ test unixWm-13.3 {Tk_WmCmd procedure, "client" option, unmapped window} {
     destroy .t2
 } {}
 
-test unixWm-14.1 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.1 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     list [catch {wm colormapwindows .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm colormapwindows window ?windowList?"}}
-test unixWm-14.2 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.2 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 200 -height 200 -colormap new
     wm geom .t2 +0+0
@@ -544,13 +544,13 @@ test unixWm-14.2 {Tk_WmCmd procedure, "colormapwindows" option} {
     update
     list $x [wm colormapwindows .t2]
 } {{.t2.b .t2} {.t2.b .t2.c .t2}}
-test unixWm-14.3 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.3 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     list [catch {wm col . "a \{"} msg] $msg
 } {1 {unmatched open brace in list}}
-test unixWm-14.4 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.4 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     list [catch {wm colormapwindows . foo} msg] $msg
 } {1 {bad window path name "foo"}}
-test unixWm-14.5 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.5 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 200 -height 200 -colormap new
     wm geom .t2 +0+0
@@ -561,7 +561,7 @@ test unixWm-14.5 {Tk_WmCmd procedure, "colormapwindows" option} {
     wm colormapwindows .t2 {.t2.c .t2 .t2.a}
     wm colormapwindows .t2
 } {.t2.c .t2 .t2.a}
-test unixWm-14.6 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.6 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 200 -height 200
     wm geom .t2 +0+0
@@ -572,7 +572,7 @@ test unixWm-14.6 {Tk_WmCmd procedure, "colormapwindows" option} {
     wm colormapwindows .t2 {.t2.b .t2.a}
     wm colormapwindows .t2
 } {.t2.b .t2.a}
-test unixWm-14.7 {Tk_WmCmd procedure, "colormapwindows" option} {
+test unixWm-14.7 {Tk_WmCmd procedure, "colormapwindows" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 200 -height 200 -colormap new
     wm geom .t2 +0+0
@@ -582,10 +582,10 @@ test unixWm-14.7 {Tk_WmCmd procedure, "colormapwindows" option} {
 } {{} {}}
 catch {destroy .t2}
 
-test unixWm-15.1 {Tk_WmCmd procedure, "command" option} {
+test unixWm-15.1 {Tk_WmCmd procedure, "command" option} unix {
     list [catch {wm command .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm command window ?value?"}}
-test unixWm-15.2 {Tk_WmCmd procedure, "command" option} {
+test unixWm-15.2 {Tk_WmCmd procedure, "command" option} unix {
     list [catch {wm command .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm command window ?value?"}}
 test unixWm-15.3 {Tk_WmCmd procedure, "command" option} {unix testwrapper} {
@@ -600,7 +600,7 @@ test unixWm-15.3 {Tk_WmCmd procedure, "command" option} {unix testwrapper} {
 } {{} {test
 command
 } {new command} {} {}}
-test unixWm-15.4 {Tk_WmCmd procedure, "command" option, window not mapped} {
+test unixWm-15.4 {Tk_WmCmd procedure, "command" option, window not mapped} unix {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 +0+0
@@ -609,14 +609,14 @@ test unixWm-15.4 {Tk_WmCmd procedure, "command" option, window not mapped} {
     wm command .t2 {}
     destroy .t2
 } {}
-test unixWm-15.5 {Tk_WmCmd procedure, "command" option} {
+test unixWm-15.5 {Tk_WmCmd procedure, "command" option} unix {
     list [catch {wm command .t "a \{b"} msg] $msg
 } {1 {unmatched open brace in list}}
 
-test unixWm-16.1 {Tk_WmCmd procedure, "deiconify" option} {
+test unixWm-16.1 {Tk_WmCmd procedure, "deiconify" option} unix {
     list [catch {wm deiconify .t 12} msg] $msg
 } {1 {wrong # args: should be "wm deiconify window"}}
-test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} {
+test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     catch {destroy .icon}
     toplevel .icon -width 50 -height 50 -bg red
     wm iconwindow .t .icon
@@ -624,7 +624,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} unix {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -632,13 +632,13 @@ test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {
     lappend result [winfo ismapped .t] [wm state .t]
 } {0 iconic 1 normal}
 
-test unixWm-17.1 {Tk_WmCmd procedure, "focusmodel" option} {
+test unixWm-17.1 {Tk_WmCmd procedure, "focusmodel" option} unix {
     list [catch {wm focusmodel .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm focusmodel window ?active|passive?"}}
-test unixWm-17.2 {Tk_WmCmd procedure, "focusmodel" option} {
+test unixWm-17.2 {Tk_WmCmd procedure, "focusmodel" option} unix {
     list [catch {wm focusmodel .t bogus} msg] $msg
 } {1 {bad argument "bogus": must be active or passive}}
-test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} {
+test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} unix {
     set result {} 
     lappend result [wm focusmodel .t]
     wm focusmodel .t active
@@ -648,13 +648,13 @@ test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} {
     set result
 } {passive active passive}
 
-test unixWm-18.1 {Tk_WmCmd procedure, "frame" option} {
+test unixWm-18.1 {Tk_WmCmd procedure, "frame" option} unix {
     list [catch {wm frame .t 12} msg] $msg
 } {1 {wrong # args: should be "wm frame window"}}
-test unixWm-18.2 {Tk_WmCmd procedure, "frame" option} nonPortable {
+test unixWm-18.2 {Tk_WmCmd procedure, "frame" option} {unix nonPortable} {
     expr [wm frame .t] == [winfo id .t]
 } {0}
-test unixWm-18.3 {Tk_WmCmd procedure, "frame" option} nonPortable {
+test unixWm-18.3 {Tk_WmCmd procedure, "frame" option} {unix nonPortable} {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 +0+0
@@ -665,20 +665,20 @@ test unixWm-18.3 {Tk_WmCmd procedure, "frame" option} nonPortable {
     set result
 } {1}
 
-test unixWm-19.1 {Tk_WmCmd procedure, "geometry" option} {
+test unixWm-19.1 {Tk_WmCmd procedure, "geometry" option} unix {
     list [catch {wm geometry .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm geometry window ?newGeometry?"}}
-test unixWm-19.2 {Tk_WmCmd procedure, "geometry" option} nonPortable {
+test unixWm-19.2 {Tk_WmCmd procedure, "geometry" option} {unix nonPortable} {
     wm geometry .t -1+5
     update
     wm geometry .t
 } {100x50-1+5}
-test unixWm-19.3 {Tk_WmCmd procedure, "geometry" option} nonPortable {
+test unixWm-19.3 {Tk_WmCmd procedure, "geometry" option} {unix nonPortable} {
     wm geometry .t +10-4
     update
     wm geometry .t
 } {100x50+10-4}
-test unixWm-19.4 {Tk_WmCmd procedure, "geometry" option} nonPortable {
+test unixWm-19.4 {Tk_WmCmd procedure, "geometry" option} {unix nonPortable} {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 -5+10
@@ -689,7 +689,7 @@ test unixWm-19.4 {Tk_WmCmd procedure, "geometry" option} nonPortable {
     destroy .t2
     set result
 } {30x12-5+10}
-test unixWm-19.5 {Tk_WmCmd procedure, "geometry" option} nonPortable {
+test unixWm-19.5 {Tk_WmCmd procedure, "geometry" option} {unix nonPortable} {
     wm geometry .t 150x300+5+6
     update
     set result {}
@@ -698,17 +698,17 @@ test unixWm-19.5 {Tk_WmCmd procedure, "geometry" option} nonPortable {
     update
     lappend result [wm geometry .t]
 } {150x300+5+6 100x50+5+6}
-test unixWm-19.6 {Tk_WmCmd procedure, "geometry" option} {
+test unixWm-19.6 {Tk_WmCmd procedure, "geometry" option} {unix} {
     list [catch {wm geometry .t qrs} msg] $msg
 } {1 {bad geometry specifier "qrs"}}
 
-test unixWm-20.1 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.1 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm grid window ?baseWidth baseHeight widthInc heightInc?"}}
-test unixWm-20.2 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.2 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 12 13 14 15 16} msg] $msg
 } {1 {wrong # args: should be "wm grid window ?baseWidth baseHeight widthInc heightInc?"}}
-test unixWm-20.3 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.3 {Tk_WmCmd procedure, "grid" option} unix {
     set result {}
     lappend result [wm grid .t]
     wm grid .t 5 6 20 10
@@ -716,28 +716,28 @@ test unixWm-20.3 {Tk_WmCmd procedure, "grid" option} {
     wm grid .t {} {} {} {}
     lappend result [wm grid .t]
 } {{} {5 6 20 10} {}}
-test unixWm-20.4 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.4 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t bad 10 11 12} msg] $msg
 } {1 {expected integer but got "bad"}}
-test unixWm-20.5 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.5 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t -1 11 12 13} msg] $msg
 } {1 {baseWidth can't be < 0}}
-test unixWm-20.6 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.6 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 foo 12 13} msg] $msg
 } {1 {expected integer but got "foo"}}
-test unixWm-20.7 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.7 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 -11 12 13} msg] $msg
 } {1 {baseHeight can't be < 0}}
-test unixWm-20.8 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.8 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 bar 13} msg] $msg
 } {1 {expected integer but got "bar"}}
-test unixWm-20.9 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.9 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 -2 13} msg] $msg
 } {1 {widthInc can't be < 0}}
-test unixWm-20.10 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.10 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 12 bogus} msg] $msg
 } {1 {expected integer but got "bogus"}}
-test unixWm-20.11 {Tk_WmCmd procedure, "grid" option} {
+test unixWm-20.11 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 12 -1} msg] $msg
 } {1 {heightInc can't be < 0}}
 
@@ -747,10 +747,10 @@ toplevel .t -width 100 -height 50
 wm geom .t +0+0
 update
 
-test unixWm-21.1 {Tk_WmCmd procedure, "group" option} {
+test unixWm-21.1 {Tk_WmCmd procedure, "group" option} unix {
     list [catch {wm group .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm group window ?pathName?"}}
-test unixWm-21.2 {Tk_WmCmd procedure, "group" option} {
+test unixWm-21.2 {Tk_WmCmd procedure, "group" option} unix {
     list [catch {wm group .t bogus} msg] $msg
 } {1 {bad window path name "bogus"}}
 test unixWm-21.3 {Tk_WmCmd procedure, "group" option} {unix testwrapper} {
@@ -804,14 +804,14 @@ test unixWm-22.2 {Tk_WmCmd procedure, "iconbitmap" option} {unix testwrapper} {
 	    WM_HINTS] 0]]]
     lappend result [wm iconbitmap .t] $bit
 } {{} questhead 0x4 {} 0x0}
-test unixWm-22.3 {Tk_WmCmd procedure, "iconbitmap" option} {
+test unixWm-22.3 {Tk_WmCmd procedure, "iconbitmap" option} unix {
     list [catch {wm iconbitmap .t bad-bitmap} msg] $msg
 } {1 {bitmap "bad-bitmap" not defined}}
 
-test unixWm-23.1 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.1 {Tk_WmCmd procedure, "iconify" option} unix {
     list [catch {wm iconify .t 12} msg] $msg
 } {1 {wrong # args: should be "wm iconify window"}}
-test unixWm-23.2 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.2 {Tk_WmCmd procedure, "iconify" option} unix {
     catch {destroy .t2}
     toplevel .t2
     wm overrideredirect .t2 1
@@ -819,7 +819,7 @@ test unixWm-23.2 {Tk_WmCmd procedure, "iconify" option} {
     destroy .t2
     set result
 } {1 {can't iconify ".t2": override-redirect flag is set}}
-test unixWm-23.3 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.3 {Tk_WmCmd procedure, "iconify" option} unix {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 +0+0
@@ -828,7 +828,7 @@ test unixWm-23.3 {Tk_WmCmd procedure, "iconify" option} {
     destroy .t2
     set result
 } {1 {can't iconify ".t2": it is a transient}}
-test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 +0+0
@@ -837,7 +837,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 +0+0
@@ -848,7 +848,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {
     destroy .t2
     set result
 } {0}
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
     catch {destroy .t2}
     toplevel .t2
     wm geom .t2 -0+0
@@ -861,7 +861,7 @@ test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {
     set result
 } {1 0}
 
-test unixWm-24.1 {Tk_WmCmd procedure, "iconmask" option} {
+test unixWm-24.1 {Tk_WmCmd procedure, "iconmask" option} unix {
     list [catch {wm iconmask .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm iconmask window ?bitmap?"}}
 test unixWm-24.2 {Tk_WmCmd procedure, "iconmask" option} {unix testwrapper} {
@@ -876,14 +876,14 @@ test unixWm-24.2 {Tk_WmCmd procedure, "iconmask" option} {unix testwrapper} {
 	    WM_HINTS] 0]]]
     lappend result [wm iconmask .t] $bit
 } {{} questhead 0x20 {} 0x0}
-test unixWm-24.3 {Tk_WmCmd procedure, "iconmask" option} {
+test unixWm-24.3 {Tk_WmCmd procedure, "iconmask" option} unix {
     list [catch {wm iconmask .t bogus} msg] $msg
 } {1 {bitmap "bogus" not defined}}
 
-test unixWm-25.1 {Tk_WmCmd procedure, "iconname" option} {
+test unixWm-25.1 {Tk_WmCmd procedure, "iconname" option} unix {
     list [catch {wm icon .t} msg] $msg
 } {1 {ambiguous option "icon": must be aspect, attributes, client, colormapwindows, command, deiconify, focusmodel, frame, geometry, grid, group, iconbitmap, iconify, iconmask, iconname, iconposition, iconwindow, maxsize, minsize, overrideredirect, positionfrom, protocol, resizable, sizefrom, stackorder, state, title, transient, or withdraw}}
-test unixWm-25.2 {Tk_WmCmd procedure, "iconname" option} {
+test unixWm-25.2 {Tk_WmCmd procedure, "iconname" option} unix {
     list [catch {wm iconname .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm iconname window ?newName?"}}
 test unixWm-25.3 {Tk_WmCmd procedure, "iconname" option} {unix testwrapper} {
@@ -895,10 +895,10 @@ test unixWm-25.3 {Tk_WmCmd procedure, "iconname" option} {unix testwrapper} {
     lappend result [wm iconname .t] [testprop [testwrapper .t] WM_ICON_NAME]
 } {{} test_name test_name {} {}}
 
-test unixWm-26.1 {Tk_WmCmd procedure, "iconposition" option} {
+test unixWm-26.1 {Tk_WmCmd procedure, "iconposition" option} unix {
     list [catch {wm iconposition .t 12} msg] $msg
 } {1 {wrong # args: should be "wm iconposition window ?x y?"}}
-test unixWm-26.2 {Tk_WmCmd procedure, "iconposition" option} {
+test unixWm-26.2 {Tk_WmCmd procedure, "iconposition" option} unix {
     list [catch {wm iconposition .t 12 13 14} msg] $msg
 } {1 {wrong # args: should be "wm iconposition window ?x y?"}}
 test unixWm-26.3 {Tk_WmCmd procedure, "iconposition" option} {unix testwrapper} {
@@ -913,14 +913,14 @@ test unixWm-26.3 {Tk_WmCmd procedure, "iconposition" option} {unix testwrapper}
 	    WM_HINTS] 0]]]
     lappend result [wm iconposition .t] $bit
 } {{} {10 15} 0xa 0xf 0x10 {} 0x0}
-test unixWm-26.4 {Tk_WmCmd procedure, "iconposition" option} {
+test unixWm-26.4 {Tk_WmCmd procedure, "iconposition" option} unix {
     list [catch {wm iconposition .t bad 13} msg] $msg
 } {1 {expected integer but got "bad"}}
-test unixWm-26.5 {Tk_WmCmd procedure, "iconposition" option} {
+test unixWm-26.5 {Tk_WmCmd procedure, "iconposition" option} unix {
     list [catch {wm iconposition .t 13 lousy} msg] $msg
 } {1 {expected integer but got "lousy"}}
 
-test unixWm-27.1 {Tk_WmCmd procedure, "iconwindow" option} {
+test unixWm-27.1 {Tk_WmCmd procedure, "iconwindow" option} unix {
     list [catch {wm iconwindow .t 12 13} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
 test unixWm-27.2 {Tk_WmCmd procedure, "iconwindow" option} {unix testwrapper} {
@@ -940,17 +940,17 @@ test unixWm-27.2 {Tk_WmCmd procedure, "iconwindow" option} {unix testwrapper} {
     destroy .icon
     set result
 } {{} .icon icon 0x8 1 {} withdrawn 0x0}
-test unixWm-27.3 {Tk_WmCmd procedure, "iconwindow" option} {
+test unixWm-27.3 {Tk_WmCmd procedure, "iconwindow" option} unix {
     list [catch {wm iconwindow .t bogus} msg] $msg
 } {1 {bad window path name "bogus"}}
-test unixWm-27.4 {Tk_WmCmd procedure, "iconwindow" option} {
+test unixWm-27.4 {Tk_WmCmd procedure, "iconwindow" option} unix {
     catch {destroy .b}
     button .b -text Help
     set result [list [catch {wm iconwindow .t .b} msg] $msg]
     destroy .b
     set result
 } {1 {can't use .b as icon window: not at top level}}
-test unixWm-27.5 {Tk_WmCmd procedure, "iconwindow" option} {
+test unixWm-27.5 {Tk_WmCmd procedure, "iconwindow" option} unix {
     catch {destroy .icon}
     toplevel .icon -width 50 -height 50 -bg green
     catch {destroy .t2}
@@ -962,7 +962,7 @@ test unixWm-27.5 {Tk_WmCmd procedure, "iconwindow" option} {
     destroy .icon
     set result
 } {1 {.icon is already an icon for .t2}}
-test unixWm-27.6 {Tk_WmCmd procedure, "iconwindow" option, changing icons} {
+test unixWm-27.6 {Tk_WmCmd procedure, "iconwindow" option, changing icons} unix {
     catch {destroy .icon}
     catch {destroy .icon2}
     toplevel .icon -width 50 -height 50 -bg green
@@ -975,7 +975,7 @@ test unixWm-27.6 {Tk_WmCmd procedure, "iconwindow" option, changing icons} {
     destroy .icon .icon2
     set result
 } {icon normal withdrawn icon}
-test unixWm-27.7 {Tk_WmCmd procedure, "iconwindow" option, withdrawing icon} {
+test unixWm-27.7 {Tk_WmCmd procedure, "iconwindow" option, withdrawing icon} unix {
     catch {destroy .icon}
     toplevel .icon -width 50 -height 50 -bg green
     wm geometry .icon +0+0
@@ -1024,13 +1024,13 @@ toplevel .t -width 100 -height 50
 wm geom .t +0+0
 update
 
-test unixWm-30.1 {Tk_WmCmd procedure, "overrideredirect" option} {
+test unixWm-30.1 {Tk_WmCmd procedure, "overrideredirect" option} unix {
     list [catch {wm overrideredirect .t 1 2} msg]  $msg
 } {1 {wrong # args: should be "wm overrideredirect window ?boolean?"}}
-test unixWm-30.2 {Tk_WmCmd procedure, "overrideredirect" option} {
+test unixWm-30.2 {Tk_WmCmd procedure, "overrideredirect" option} unix {
     list [catch {wm overrideredirect .t boo} msg]  $msg
 } {1 {expected boolean value but got "boo"}}
-test unixWm-30.3 {Tk_WmCmd procedure, "overrideredirect" option} {
+test unixWm-30.3 {Tk_WmCmd procedure, "overrideredirect" option} unix {
     set result {}
     lappend result [wm overrideredirect .t]
     wm overrideredirect .t true
@@ -1039,7 +1039,7 @@ test unixWm-30.3 {Tk_WmCmd procedure, "overrideredirect" option} {
     lappend result [wm overrideredirect .t]
 } {0 1 0}
 
-test unixWm-31.1 {Tk_WmCmd procedure, "positionfrom" option} {
+test unixWm-31.1 {Tk_WmCmd procedure, "positionfrom" option} unix {
     list [catch {wm positionfrom .t 1 2} msg]  $msg
 } {1 {wrong # args: should be "wm positionfrom window ?user/program?"}}
 test unixWm-31.2 {Tk_WmCmd procedure, "positionfrom" option} {unix testwrapper} {
@@ -1056,14 +1056,14 @@ test unixWm-31.2 {Tk_WmCmd procedure, "positionfrom" option} {unix testwrapper}
 	    WM_NORMAL_HINTS] 0]]]
     lappend result [wm positionfrom .t] $bit
 } {user program 0x4 user 0x1}
-test unixWm-31.3 {Tk_WmCmd procedure, "positionfrom" option} {
+test unixWm-31.3 {Tk_WmCmd procedure, "positionfrom" option} unix {
     list [catch {wm positionfrom .t none} msg]  $msg
 } {1 {bad argument "none": must be program or user}}
 
-test unixWm-32.1 {Tk_WmCmd procedure, "protocol" option} {
+test unixWm-32.1 {Tk_WmCmd procedure, "protocol" option} unix {
     list [catch {wm protocol .t 1 2 3} msg]  $msg
 } {1 {wrong # args: should be "wm protocol window ?name? ?command?"}}
-test unixWm-32.2 {Tk_WmCmd procedure, "protocol" option} {
+test unixWm-32.2 {Tk_WmCmd procedure, "protocol" option} unix {
     wm protocol .t {foo a} {a b c}
     wm protocol .t bar {test script for bar}
     set result [wm protocol .t]
@@ -1094,7 +1094,7 @@ test unixWm-32.3 {Tk_WmCmd procedure, "protocol" option} {unix testwrapper} {
     }
     lappend result [wm protocol .t] $x
 } {{} WM_DELETE_WINDOW {bar foo} {WM_DELETE_WINDOW bar foo} {} WM_DELETE_WINDOW}
-test unixWm-32.4 {Tk_WmCmd procedure, "protocol" option} {
+test unixWm-32.4 {Tk_WmCmd procedure, "protocol" option} unix {
     set result {}
     wm protocol .t foo {a b c}
     wm protocol .t bar {test script for bar}
@@ -1103,7 +1103,7 @@ test unixWm-32.4 {Tk_WmCmd procedure, "protocol" option} {
     wm protocol .t bar {}
     lappend result [wm protocol .t foo] [wm protocol .t bar]
 } {{a b c} {test script for bar} {} {}}
-test unixWm-32.5 {Tk_WmCmd procedure, "protocol" option} {
+test unixWm-32.5 {Tk_WmCmd procedure, "protocol" option} unix {
     wm protocol .t foo {a b c}
     wm protocol .t foo {test script}
     set result [wm protocol .t foo]
@@ -1111,22 +1111,22 @@ test unixWm-32.5 {Tk_WmCmd procedure, "protocol" option} {
     set result
 } {test script}
 
-test unixWm-33.1 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.1 {Tk_WmCmd procedure, "resizable" option} unix {
     list [catch {wm resizable . a} msg]  $msg
 } {1 {wrong # args: should be "wm resizable window ?width height?"}}
-test unixWm-33.2 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.2 {Tk_WmCmd procedure, "resizable" option} unix {
     list [catch {wm resizable . a b c} msg]  $msg
 } {1 {wrong # args: should be "wm resizable window ?width height?"}}
-test unixWm-33.3 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.3 {Tk_WmCmd procedure, "resizable" option} unix {
     list [catch {wm resizable .foo a b c} msg]  $msg
 } {1 {bad window path name ".foo"}}
-test unixWm-33.4 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.4 {Tk_WmCmd procedure, "resizable" option} unix {
     list [catch {wm resizable . x 1} msg]  $msg
 } {1 {expected boolean value but got "x"}}
-test unixWm-33.5 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.5 {Tk_WmCmd procedure, "resizable" option} unix {
     list [catch {wm resizable . 0 gorp} msg]  $msg
 } {1 {expected boolean value but got "gorp"}}
-test unixWm-33.6 {Tk_WmCmd procedure, "resizable" option} {
+test unixWm-33.6 {Tk_WmCmd procedure, "resizable" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 200 -height 100
     wm geom .t2 +0+0
@@ -1142,7 +1142,7 @@ test unixWm-33.6 {Tk_WmCmd procedure, "resizable" option} {
     set result
 } {{1 1} {1 0} {0 0} {0 1}}
 
-test unixWm-34.1 {Tk_WmCmd procedure, "sizefrom" option} {
+test unixWm-34.1 {Tk_WmCmd procedure, "sizefrom" option} unix {
     list [catch {wm sizefrom .t 1 2} msg]  $msg
 } {1 {wrong # args: should be "wm sizefrom window ?user|program?"}}
 test unixWm-34.2 {Tk_WmCmd procedure, "sizefrom" option} {unix testwrapper} {
@@ -1159,17 +1159,17 @@ test unixWm-34.2 {Tk_WmCmd procedure, "sizefrom" option} {unix testwrapper} {
 	    WM_NORMAL_HINTS] 0]]]
     lappend result [wm sizefrom .t] $bit
 } {{} program 0x8 user 0x2}
-test unixWm-34.3 {Tk_WmCmd procedure, "sizefrom" option} {
+test unixWm-34.3 {Tk_WmCmd procedure, "sizefrom" option} unix {
     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} 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} {
+test unixWm-35.2 {Tk_WmCmd procedure, "state" option} unix {
     list [catch {wm state .t iconic 1} msg]  $msg
 } {1 {wrong # args: should be "wm state window ?state?"}}
-test unixWm-35.3 {Tk_WmCmd procedure, "state" option} {
+test unixWm-35.3 {Tk_WmCmd procedure, "state" option} unix {
     set result {}
     catch {destroy .t2}
     toplevel .t2 -width 120 -height 300
@@ -1186,7 +1186,7 @@ test unixWm-35.3 {Tk_WmCmd procedure, "state" option} {
     destroy .t2
     set result
 } {normal normal withdrawn iconic normal}
-test unixWm-35.4 {Tk_WmCmd procedure, "state" option} {
+test unixWm-35.4 {Tk_WmCmd procedure, "state" option} unix {
     set result {}
     catch {destroy .t2}
     toplevel .t2 -width 120 -height 300
@@ -1204,7 +1204,7 @@ test unixWm-35.4 {Tk_WmCmd procedure, "state" option} {
     set result
 } {normal normal withdrawn iconic normal}
 
-test unixWm-36.1 {Tk_WmCmd procedure, "title" option} {
+test unixWm-36.1 {Tk_WmCmd procedure, "title" option} unix {
     list [catch {wm title .t 1 2} msg]  $msg
 } {1 {wrong # args: should be "wm title window ?newTitle?"}}
 test unixWm-36.2 {Tk_WmCmd procedure, "title" option} {unix testwrapper} {
@@ -1258,10 +1258,10 @@ test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper}
     set result
 } {{} 0}
 
-test unixWm-38.1 {Tk_WmCmd procedure, "withdraw" option} {
+test unixWm-38.1 {Tk_WmCmd procedure, "withdraw" option} unix {
     list [catch {wm withdraw .t 1} msg]  $msg
 } {1 {wrong # args: should be "wm withdraw window"}}
-test unixWm-38.2 {Tk_WmCmd procedure, "withdraw" option} {
+test unixWm-38.2 {Tk_WmCmd procedure, "withdraw" option} unix {
     catch {destroy .t2}
     toplevel .t2 -width 120 -height 300
     wm geometry .t2 +0+0
@@ -1270,7 +1270,7 @@ test unixWm-38.2 {Tk_WmCmd procedure, "withdraw" option} {
     destroy .t2
     set result
 } {1 {can't withdraw .t2: it is an icon for .t}}
-test unixWm-38.3 {Tk_WmCmd procedure, "withdraw" option} {
+test unixWm-38.3 {Tk_WmCmd procedure, "withdraw" option} unix {
     set result {}
     wm withdraw .t
     lappend result [wm state .t] [winfo ismapped .t]
@@ -1278,14 +1278,14 @@ test unixWm-38.3 {Tk_WmCmd procedure, "withdraw" option} {
     lappend result [wm state .t] [winfo ismapped .t]
 } {withdrawn 0 normal 1}
 
-test unixWm-39.1 {Tk_WmCmd procedure, miscellaneous} {
+test unixWm-39.1 {Tk_WmCmd procedure, miscellaneous} unix {
     list [catch {wm unknown .t} msg] $msg
 } {1 {bad option "unknown": must be aspect, attributes, client, colormapwindows, command, deiconify, focusmodel, frame, geometry, grid, group, iconbitmap, iconify, iconmask, iconname, iconposition, iconwindow, maxsize, minsize, overrideredirect, positionfrom, protocol, resizable, sizefrom, stackorder, state, title, transient, or withdraw}}
 
 catch {destroy .t}
 catch {destroy .icon}
 
-test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on grid} {nonPortable} {
+test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on grid} {unix nonPortable} {
     catch {destroy .t}
     toplevel .t
     wm geometry .t 30x10+0+0
@@ -1294,7 +1294,7 @@ test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on gr
     update
     wm geometry .t
 } {30x10+0+0}
-test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already set} {
+test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already set} unix {
     catch {destroy .t}
     toplevel .t
     wm geometry .t 200x100+0+0
@@ -1306,7 +1306,7 @@ test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already
     wm geometry .t
 } {20x20+0+0}
 
-test unixWm-41.1 {ConfigureEvent procedure, internally generated size changes} {
+test unixWm-41.1 {ConfigureEvent procedure, internally generated size changes} unix {
     catch {destroy .t}
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1317,7 +1317,7 @@ test unixWm-41.1 {ConfigureEvent procedure, internally generated size changes} {
     sleep 500
     lappend result [winfo width .t] [winfo height .t]
 } {400 150 200 300}
-test unixWm-41.2 {ConfigureEvent procedure, menubars} {nonPortable testmenubar} {
+test unixWm-41.2 {ConfigureEvent procedure, menubars} {nonPortable testmenubar} unix {
     catch {destroy .t}
     toplevel .t -width 300 -height 200 -bd 2 -relief raised
     wm geom .t +0+0
@@ -1342,7 +1342,7 @@ test unixWm-41.2 {ConfigureEvent procedure, menubars} {nonPortable testmenubar}
 	    [expr [winfo rootx .t] - $x] [expr [winfo rooty .t] - $y] \
 	    [winfo width .t] [winfo height .t]
 } {{.t.m: 200x20} {.t: 200x300} 0 0 200 20 0 20 200 300}
-test unixWm-41.3 {ConfigureEvent procedure, synthesized Configure events} {
+test unixWm-41.3 {ConfigureEvent procedure, synthesized Configure events} unix {
     catch {destroy .t}
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1353,7 +1353,7 @@ test unixWm-41.3 {ConfigureEvent procedure, synthesized Configure events} {
     update
     set result
 } {configured: 400 150}
-test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} {
+test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
     catch {destroy .t}
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1368,7 +1368,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
     catch {destroy .t}
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1384,7 +1384,7 @@ test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {
     lappend result $x [winfo ismapped .t]
 } {unmapped 0 mapped 1}
 
-test unixWm-43.1 {TopLevelReqProc procedure, embedded in same process} {
+test unixWm-43.1 {TopLevelReqProc procedure, embedded in same process} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200
     wm geom .t +0+0
@@ -1402,7 +1402,7 @@ test unixWm-43.1 {TopLevelReqProc procedure, embedded in same process} {
     set result
 } {70 120 70 120}
 test unixWm-43.2 {TopLevelReqProc procedure, resize causes window to move} \
-	{nonPortable} {
+	{unix nonPortable} {
     catch {destroy .t}
     toplevel .t -width 200 -height 200
     wm geom .t +0+0
@@ -1417,7 +1417,7 @@ test unixWm-43.2 {TopLevelReqProc procedure, resize causes window to move} \
 	    [winfo width .t] [winfo height .t]
 } {-100 50 300 150}
 
-test unixWm-44.1 {UpdateGeometryInfo procedure, width/height computation} {
+test unixWm-44.1 {UpdateGeometryInfo procedure, width/height computation} unix {
     catch {destroy .t}
     toplevel .t -width 100 -height 200
     wm geometry .t +30+40
@@ -1427,7 +1427,7 @@ test unixWm-44.1 {UpdateGeometryInfo procedure, width/height computation} {
     update
     list [winfo width .t] [winfo height .t]
 } {180 20}
-test unixWm-44.2 {UpdateGeometryInfo procedure, width/height computation} {
+test unixWm-44.2 {UpdateGeometryInfo procedure, width/height computation} unix {
     catch {destroy .t}
     toplevel .t -width 80 -height 60
     wm grid .t 5 4 10 12
@@ -1438,7 +1438,7 @@ test unixWm-44.2 {UpdateGeometryInfo procedure, width/height computation} {
     update
     list [winfo width .t] [winfo height .t]
 } {130 36}
-test unixWm-44.3 {UpdateGeometryInfo procedure, width/height computation} {
+test unixWm-44.3 {UpdateGeometryInfo procedure, width/height computation} unix {
     catch {destroy .t}
     toplevel .t -width 80 -height 60
     wm grid .t 5 4 10 12
@@ -1449,7 +1449,7 @@ test unixWm-44.3 {UpdateGeometryInfo procedure, width/height computation} {
     update
     list [winfo width .t] [winfo height .t]
 } {40 132}
-test unixWm-44.4 {UpdateGeometryInfo procedure, width/height computation} {
+test unixWm-44.4 {UpdateGeometryInfo procedure, width/height computation} unix {
     catch {destroy .t}
     toplevel .t -width 100 -height 200
     wm geometry .t +30+40
@@ -1459,7 +1459,7 @@ test unixWm-44.4 {UpdateGeometryInfo procedure, width/height computation} {
     update
     list [winfo width .t] [winfo height .t]
 } {300 150}
-test unixWm-44.5 {UpdateGeometryInfo procedure, negative width} {
+test unixWm-44.5 {UpdateGeometryInfo procedure, negative width} unix {
     catch {destroy .t}
     toplevel .t -width 80 -height 60
     wm grid .t 18 7 10 12
@@ -1470,7 +1470,7 @@ test unixWm-44.5 {UpdateGeometryInfo procedure, negative width} {
     update
     list [winfo width .t] [winfo height .t]
 } {1 72}
-test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} {
+test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} unix {
     catch {destroy .t}
     toplevel .t -width 80 -height 60
     wm grid .t 18 7 10 12
@@ -1484,7 +1484,7 @@ test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} {
 
 catch {destroy .t}
 toplevel .t -width 80 -height 60
-test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {
+test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} unix {
     wm geometry .t +5-10
     wm overrideredirect .t 1
     tkwait visibility .t
@@ -1493,7 +1493,7 @@ test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {
 
 catch {destroy .t}
 toplevel .t -width 80 -height 60
-test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {
+test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} unix {
     wm geometry .t -30+2
     wm overrideredirect .t 1
     tkwait visibility .t
@@ -1586,7 +1586,7 @@ test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenub
 
 # I don't know how to test WaitForConfigureNotify.
 
-test unixWm-46.1 {WaitForEvent procedure, use of modal timeout} {
+test unixWm-46.1 {WaitForEvent procedure, use of modal timeout} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200
     wm geom .t +0+0
@@ -1600,7 +1600,7 @@ test unixWm-46.1 {WaitForEvent procedure, use of modal timeout} {
     list $result $x
 } {no yes}
 
-test unixWm-47.1 {WaitRestrictProc procedure} {nonPortable} {
+test unixWm-47.1 {WaitRestrictProc procedure} {unix nonPortable} {
     catch {destroy .t}
     toplevel .t -width 300 -height 200
     frame .t.f -bd 2 -relief raised
@@ -1631,45 +1631,45 @@ toplevel .t -width 300 -height 200
 wm geometry .t +0+0
 tkwait visibility .t
 
-test unixWm-48.1 {ParseGeometry procedure} {
+test unixWm-48.1 {ParseGeometry procedure} unix {
     wm geometry .t =100x120
     update
     list [winfo width .t] [winfo height .t]
 } {100 120}
-test unixWm-48.2 {ParseGeometry procedure} {
+test unixWm-48.2 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t =10zx120} msg] $msg
 } {1 {bad geometry specifier "=10zx120"}}
-test unixWm-48.3 {ParseGeometry procedure} {
+test unixWm-48.3 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t x120} msg] $msg
 } {1 {bad geometry specifier "x120"}}
-test unixWm-48.4 {ParseGeometry procedure} {
+test unixWm-48.4 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t =100x120a} msg] $msg
 } {1 {bad geometry specifier "=100x120a"}}
-test unixWm-48.5 {ParseGeometry procedure} {
+test unixWm-48.5 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t z} msg] $msg
 } {1 {bad geometry specifier "z"}}
-test unixWm-48.6 {ParseGeometry procedure} {
+test unixWm-48.6 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t +20&} msg] $msg
 } {1 {bad geometry specifier "+20&"}}
-test unixWm-48.7 {ParseGeometry procedure} {
+test unixWm-48.7 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t +-} msg] $msg
 } {1 {bad geometry specifier "+-"}}
-test unixWm-48.8 {ParseGeometry procedure} {
+test unixWm-48.8 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t +20a} msg] $msg
 } {1 {bad geometry specifier "+20a"}}
-test unixWm-48.9 {ParseGeometry procedure} {
+test unixWm-48.9 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t +20-} msg] $msg
 } {1 {bad geometry specifier "+20-"}}
-test unixWm-48.10 {ParseGeometry procedure} {
+test unixWm-48.10 {ParseGeometry procedure} unix {
     list [catch {wm geometry .t +20+10z} msg] $msg
 } {1 {bad geometry specifier "+20+10z"}}
-test unixWm-48.11 {ParseGeometry procedure} {
+test unixWm-48.11 {ParseGeometry procedure} unix {
     catch {wm geometry .t +-10+20}
 } {0}
-test unixWm-48.12 {ParseGeometry procedure} {
+test unixWm-48.12 {ParseGeometry procedure} unix {
     catch {wm geometry .t +30+-10}
 } {0}
-test unixWm-48.13 {ParseGeometry procedure, resize causes window to move} {
+test unixWm-48.13 {ParseGeometry procedure, resize causes window to move} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200
     wm geom .t +0+0
@@ -1684,7 +1684,7 @@ test unixWm-48.13 {ParseGeometry procedure, resize causes window to move} {
 	    [winfo width .t] [winfo height .t]
 } {50 -100 150 300}
 
-test unixWm-49.1 {Tk_GetRootCoords procedure} {
+test unixWm-49.1 {Tk_GetRootCoords procedure} unix {
     catch {destroy .t}
     toplevel .t -width 300 -height 200
     frame .t.f -width 150 -height 100 -bd 2 -relief raised
@@ -1716,7 +1716,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
 
 deleteWindows
 wm iconify .
-test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} {
+test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} unix {
     deleteWindows
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +40+0
@@ -1736,7 +1736,7 @@ test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} {
 	    [winfo containing [expr $x + 200] [expr $y + 250]] \
 	    [winfo containing [expr $x + 220] [expr $y + 250]]
 } {{} {} .t {} .t2 .t2 {} .t}
-test unixWm-50.2 {Tk_CoordsToWindow procedure, finding a toplevel, y-coords and overrideredirect} {
+test unixWm-50.2 {Tk_CoordsToWindow procedure, finding a toplevel, y-coords and overrideredirect} unix {
     deleteWindows
     toplevel .t -width 300 -height 400 -bg yellow
     wm geom .t +0+50
@@ -1786,7 +1786,7 @@ test unixWm-50.3 {
 } -cleanup {
     cleanupbg
 } -result {{} .x .t .t.f}
-test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} {
+test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} unix {
     catch {destroy .t}
     catch {interp delete slave}
     toplevel .t -width 200 -height 200 -bg green
@@ -1822,7 +1822,7 @@ test unixWm-50.5 {Tk_CoordsToWindow procedure, handling menubars} {unix testmenu
 		[winfo containing [expr $x + 11] [expr $y + 152]] \
 		[winfo containing [expr $x + 12] [expr $y + 152]]
 } {{} .t.menu .t.menu .t.menu.f .t .t .t.f}
-test unixWm-50.6 {Tk_CoordsToWindow procedure, embedding within one app.} {
+test unixWm-50.6 {Tk_CoordsToWindow procedure, embedding within one app.} unix {
     deleteWindows
     toplevel .t -width 300 -height 400 -bg orange
     wm geom .t +0+50
@@ -1839,7 +1839,7 @@ test unixWm-50.6 {Tk_CoordsToWindow procedure, embedding within one app.} {
 	    [winfo containing [expr $x +249] [expr $y +80]] \
 	    [winfo containing [expr $x +250] [expr $y +80]]
 } {.t .t2 .t2 .t}
-test unixWm-50.7 {Tk_CoordsToWindow procedure, more basics} {
+test unixWm-50.7 {Tk_CoordsToWindow procedure, more basics} unix {
     catch {destroy .t}
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +0+0
@@ -1856,7 +1856,7 @@ test unixWm-50.7 {Tk_CoordsToWindow procedure, more basics} {
 	    [winfo containing $x [expr $y + 350]] \
 	    [winfo containing $x [expr $y + 450]]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} {
+test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
     catch {destroy .t}
     toplevel .t -width 400 -height 300 -bg green
     wm geom .t +0+0
@@ -1873,7 +1873,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
     catch {destroy .t}
     catch {destroy .t2}
     sleep 500		;# Give window manager time to catch up.
@@ -1887,7 +1887,7 @@ test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {
     wm iconify .t2
     lappend result [winfo containing 100 100]
 } {.t2 .t}
-test unixWm-50.10 {Tk_CoordsToWindow procedure, unmapped windows} {
+test unixWm-50.10 {Tk_CoordsToWindow procedure, unmapped windows} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200 -bg green
     wm geometry .t +0+0
@@ -1905,19 +1905,19 @@ wm deiconify .
 # No tests for UpdateVRootGeometry, Tk_GetVRootGeometry,
 # Tk_MoveToplevelWindow, UpdateWmProtocols, or TkWmProtocolEventProc.
 
-test unixWm-51.1 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
+test unixWm-51.1 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
     makeToplevels
     update
     raise .raise1
     winfo containing [winfo rootx .raise1] [winfo rooty .raise1]
 } .raise1
-test unixWm-51.2 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
+test unixWm-51.2 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
     makeToplevels
     update
     raise .raise2
     winfo containing [winfo rootx .raise1] [winfo rooty .raise1]
 } .raise2
-test unixWm-51.3 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
+test unixWm-51.3 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
     makeToplevels
     update
     raise .raise3
@@ -1930,7 +1930,7 @@ test unixWm-51.3 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
     list $result [winfo containing [winfo rootx .raise1] \
 	    [winfo rooty .raise1]]
 } {.raise2 .raise1}
-test unixWm-51.4 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
+test unixWm-51.4 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
     makeToplevels
     raise .raise2
     raise .raise1
@@ -1940,7 +1940,7 @@ test unixWm-51.4 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
     sleep 500
     lappend result [winfo containing 100 100]
 } {.raise1 .raise3}
-test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
+test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
     makeToplevels
     update
     raise .raise2
@@ -1957,7 +1957,7 @@ test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {nonPortable} {
 	    [winfo rooty .raise2]]
 } {.raise1 .raise3}
 deleteWindows
-test unixWm-51.6 {TkWmRestackToplevel procedure, window to be stacked isn't mapped} {
+test unixWm-51.6 {TkWmRestackToplevel procedure, window to be stacked isn't mapped} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200 -bg green
     wm geometry .t +0+0
@@ -1967,7 +1967,7 @@ test unixWm-51.6 {TkWmRestackToplevel procedure, window to be stacked isn't mapp
     wm geometry .t2 +0+0
     winfo containing 100 100
 } {.t}
-test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {
+test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} unix {
     foreach w {.t .t2 .t3} {
 	catch {destroy $w}
 	toplevel $w -width 200 -height 200 -bg green
@@ -1981,7 +1981,7 @@ test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {
     sleep 2000
     lappend result [winfo containing 100 100]
 } {.t3 .t}
-test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} {
+test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200 -bg green
     wm overrideredirect .t 1
@@ -2006,7 +2006,7 @@ test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} {
     raise .t2
     lappend result [winfo containing $x $y]
 } {.t2 .t .t2}
-test unixWm-51.9 {TkWmRestackToplevel procedure, other window overrideredirect} {
+test unixWm-51.9 {TkWmRestackToplevel procedure, other window overrideredirect} unix {
     foreach w {.t .t2 .t3} {
 	catch {destroy $w}
 	toplevel $w -width 200 -height 200 -bg green
@@ -2028,36 +2028,36 @@ test unixWm-51.9 {TkWmRestackToplevel procedure, other window overrideredirect}
     lower .t2
     lappend result [winfo containing $x $y]
 } {.t2 .t3}
-test unixWm-51.10 {TkWmRestackToplevel procedure, don't move window that's already in the right place} {
+test unixWm-51.10 {TkWmRestackToplevel procedure, don't move window that's already in the right place} unix {
     makeToplevels
     raise .raise1
     set time [lindex [time {raise .raise1}] 0]
     expr {$time < 2000000}
 } 1
-test unixWm-51.11 {TkWmRestackToplevel procedure, don't move window that's already in the right place} {
+test unixWm-51.11 {TkWmRestackToplevel procedure, don't move window that's already in the right place} unix {
     makeToplevels
     set time [lindex [time {lower .raise1}] 0]
     expr {$time < 2000000}
 } 1
-test unixWm-51.12 {TkWmRestackToplevel procedure, don't move window that's already in the right place} {
+test unixWm-51.12 {TkWmRestackToplevel procedure, don't move window that's already in the right place} unix {
     makeToplevels
     set time [lindex [time {raise .raise3 .raise2}] 0]
     expr {$time < 2000000}
 } 1
-test unixWm-51.13 {TkWmRestackToplevel procedure, don't move window that's already in the right place} {
+test unixWm-51.13 {TkWmRestackToplevel procedure, don't move window that's already in the right place} unix {
     makeToplevels
     set time [lindex [time {lower .raise1 .raise2}] 0]
     expr {$time < 2000000}
 } 1
 
-test unixWm-52.1 {TkWmAddToColormapWindows procedure} {
+test unixWm-52.1 {TkWmAddToColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -width 200 -height 200 -colormap new -relief raised -bd 2
     wm geom .t +0+0
     update
     wm colormap .t
 } {}
-test unixWm-52.2 {TkWmAddToColormapWindows procedure} {
+test unixWm-52.2 {TkWmAddToColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -colormap new -relief raised -bd 2
     wm geom .t +0+0
@@ -2066,7 +2066,7 @@ test unixWm-52.2 {TkWmAddToColormapWindows procedure} {
     update
     wm colormap .t
 } {.t.f .t}
-test unixWm-52.3 {TkWmAddToColormapWindows procedure} {
+test unixWm-52.3 {TkWmAddToColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -colormap new
     wm geom .t +0+0
@@ -2077,7 +2077,7 @@ test unixWm-52.3 {TkWmAddToColormapWindows procedure} {
     update
     wm colormap .t
 } {.t.f .t.f2 .t}
-test unixWm-52.4 {TkWmAddToColormapWindows procedure} {
+test unixWm-52.4 {TkWmAddToColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -colormap new
     wm geom .t +0+0
@@ -2091,7 +2091,7 @@ test unixWm-52.4 {TkWmAddToColormapWindows procedure} {
     wm colormapwindows .t
 } {.t.f}
 
-test unixWm-53.1 {TkWmRemoveFromColormapWindows procedure} {
+test unixWm-53.1 {TkWmRemoveFromColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -colormap new
     wm geom .t +0+0
@@ -2103,7 +2103,7 @@ test unixWm-53.1 {TkWmRemoveFromColormapWindows procedure} {
     destroy .t.f2
     wm colormap .t
 } {.t.f .t}
-test unixWm-53.2 {TkWmRemoveFromColormapWindows procedure} {
+test unixWm-53.2 {TkWmRemoveFromColormapWindows procedure} unix {
     catch {destroy .t}
     toplevel .t -colormap new
     wm geom .t +0+0
@@ -2339,7 +2339,7 @@ argumentNumber18
 
 # Test exit processing and cleanup:
 
-test unixWm-59.1 {exit processing} {
+test unixWm-59.1 {exit processing} unix {
     set script [makeFile {
 	update
 	exit
@@ -2352,7 +2352,7 @@ test unixWm-59.1 {exit processing} {
     removeFile script
     list $error $msg
 } {0 {}}
-test unixWm-59.2 {exit processing} {
+test unixWm-59.2 {exit processing} unix {
     set script [makeFile {
 	interp create x
 	x eval {set argc 2}
@@ -2369,7 +2369,7 @@ test unixWm-59.2 {exit processing} {
     removeFile script
     list $error $msg
 } {0 {}}
-test unixWm-59.3 {exit processing} {
+test unixWm-59.3 {exit processing} unix {
     set script [makeFile {
 	interp create x
 	x eval {set argc 2}