* Converted several files in the Tk test suite for testing by

	tcltest 2.1.

1 files changed, 125 insertions, 133 deletions

diff --git a/tests/unixMenu.test b/tests/unixMenu.test
index fe67be6..ed4a048 100644
--- a/tests/unixMenu.test
+++ b/tests/unixMenu.test
@@ -7,25 +7,17 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixMenu.test,v 1.5 2001/08/01 16:21:12 dgp Exp $
+# RCS: @(#) $Id: unixMenu.test,v 1.6 2002/07/12 13:41:00 dgp Exp $
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {$tcl_platform(platform) != "unix"} {
-    puts "skipping: Unix only tests..."
-    ::tcltest::cleanupTests
-    return
-}
-
-if {[lsearch [image types] test] < 0} {
-    puts "This application hasn't been compiled with the \"test\" image"
-    puts "type, so I can't run this test.  Are you sure you're using"
-    puts "tktest instead of wish?"
-    ::tcltest::cleanupTests
-    return
-}
+package require tcltest 2.1
+namespace import -force tcltest::test
+namespace import -force tcltest::testConstraint
+namespace import -force tcltest::testsDirectory
+namespace import -force tcltest::configure
+configure -testdir [file join [pwd] [file dirname [info script]]]
+configure -loadfile [file join [testsDirectory] constraints.tcl]
+tcltest::loadTestedCommands
+eval configure $argv
 
 proc deleteWindows {} {
     foreach i [winfo children .] {
@@ -37,11 +29,11 @@ deleteWindows
 wm geometry . {}
 raise .
 
-test unixMenu-1.1 {TkpNewMenu - normal menu} {
+test unixMenu-1.1 {TkpNewMenu - normal menu} unix {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [destroy .m1]
 } {0 .m1 {}}
-test unixMenu-1.2 {TkpNewMenu - help menu} {
+test unixMenu-1.2 {TkpNewMenu - help menu} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     . configure -menu .m1
@@ -52,13 +44,13 @@ test unixMenu-1.2 {TkpNewMenu - help menu} {
 test unixMenu-2.1 {TkpDestroyMenu - nothing to do} {} {}
 test unixMenu-3.1 {TkpDestroymenuEntry - nothing to do} {} {}
 
-test unixMenu-4.1 {TkpConfigureMenuEntry - non-cascade entry} {
+test unixMenu-4.1 {TkpConfigureMenuEntry - non-cascade entry} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label test
     list [catch {.m1 entryconfigure test -label foo} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-4.2 {TkpConfigureMenuEntry - cascade entry} {
+test unixMenu-4.2 {TkpConfigureMenuEntry - cascade entry} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m2 -label test
@@ -68,14 +60,14 @@ test unixMenu-4.2 {TkpConfigureMenuEntry - cascade entry} {
 
 test unixMenu-5.1 {TkpMenuNewEntry - nothing to do} {} {}
 
-test unixMenu-6.1 {TkpSetWindowMenuBar - null menu} {
+test unixMenu-6.1 {TkpSetWindowMenuBar - null menu} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
     . configure -menu .m1
     list [catch {. configure -menu ""} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-6.2 {TkpSetWindowMenuBar - menu} {
+test unixMenu-6.2 {TkpSetWindowMenuBar - menu} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
@@ -84,19 +76,19 @@ test unixMenu-6.2 {TkpSetWindowMenuBar - menu} {
 
 test unixMenu-7.1 {TkpSetMainMenubar - nothing to do} {} {}
 
-test unixMenu-8.1 {GetMenuIndicatorGeometry - indicator off} {
+test unixMenu-8.1 {GetMenuIndicatorGeometry - indicator off} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.2 {GetMenuIndicatorGeometry - not checkbutton or radio} {
+test unixMenu-8.2 {GetMenuIndicatorGeometry - not checkbutton or radio} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.3 {GetMenuIndicatorGeometry - checkbutton image} {
+test unixMenu-8.3 {GetMenuIndicatorGeometry - checkbutton image} {unix testImageType} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
@@ -105,21 +97,21 @@ test unixMenu-8.3 {GetMenuIndicatorGeometry - checkbutton image} {
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1] [image delete image1]
 } {0 {} {}}
-test unixMenu-8.4 {GetMenuIndicatorGeometry - checkbutton bitmap} {
+test unixMenu-8.4 {GetMenuIndicatorGeometry - checkbutton bitmap} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -bitmap questhead -label foo
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.5 {GetMenuIndicatorGeometry - checkbutton} {
+test unixMenu-8.5 {GetMenuIndicatorGeometry - checkbutton} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.6 {GetMenuIndicatorGeometry - radiobutton image} {
+test unixMenu-8.6 {GetMenuIndicatorGeometry - radiobutton image} {unix testImageType} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
@@ -128,21 +120,21 @@ test unixMenu-8.6 {GetMenuIndicatorGeometry - radiobutton image} {
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1] [image delete image1]
 } {0 {} {}}
-test unixMenu-8.7 {GetMenuIndicatorGeometry - radiobutton bitmap} {
+test unixMenu-8.7 {GetMenuIndicatorGeometry - radiobutton bitmap} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -bitmap questhead -label foo
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.8 {GetMenuIndicatorGeometry - radiobutton} {
+test unixMenu-8.8 {GetMenuIndicatorGeometry - radiobutton} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo
     .m1 invoke foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-8.9 {GetMenuIndicatorGeometry - hideMargin} {
+test unixMenu-8.9 {GetMenuIndicatorGeometry - hideMargin} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo -hidemargin 1
@@ -150,26 +142,26 @@ test unixMenu-8.9 {GetMenuIndicatorGeometry - hideMargin} {
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test unixMenu-9.1 {GetMenuAccelGeometry - cascade entry} {
+test unixMenu-9.1 {GetMenuAccelGeometry - cascade entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-9.2 {GetMenuAccelGeometry - non-null label} {
+test unixMenu-9.2 {GetMenuAccelGeometry - non-null label} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+S"
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test unixMenu-9.3 {GetMenuAccelGeometry - null label} {
+test unixMenu-9.3 {GetMenuAccelGeometry - null label} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test unixMenu-10.1 {DrawMenuEntryBackground - active menubar} {
+test unixMenu-10.1 {DrawMenuEntryBackground - active menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
@@ -177,7 +169,7 @@ test unixMenu-10.1 {DrawMenuEntryBackground - active menubar} {
     .m1 activate 1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-10.2 {DrawMenuEntryBackground - active} {
+test unixMenu-10.2 {DrawMenuEntryBackground - active} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -185,7 +177,7 @@ test unixMenu-10.2 {DrawMenuEntryBackground - active} {
     $tearoff activate 0
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-10.3 {DrawMenuEntryBackground - non-active} {
+test unixMenu-10.3 {DrawMenuEntryBackground - non-active} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -193,7 +185,7 @@ test unixMenu-10.3 {DrawMenuEntryBackground - non-active} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-11.1 {DrawMenuEntryAccelerator - menubar} {
+test unixMenu-11.1 {DrawMenuEntryAccelerator - menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
@@ -201,21 +193,21 @@ test unixMenu-11.1 {DrawMenuEntryAccelerator - menubar} {
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 # drawArrow parameter is never false under Unix
-test unixMenu-11.2 {DrawMenuEntryAccelerator - cascade entry} {
+test unixMenu-11.2 {DrawMenuEntryAccelerator - cascade entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-11.3 {DrawMenuEntryAccelerator - normal entry} {
+test unixMenu-11.3 {DrawMenuEntryAccelerator - normal entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-11.4 {DrawMenuEntryAccelerator - null entry} {
+test unixMenu-11.4 {DrawMenuEntryAccelerator - null entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -223,28 +215,28 @@ test unixMenu-11.4 {DrawMenuEntryAccelerator - null entry} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-12.1 {DrawMenuEntryIndicator - non-check or radio} {
+test unixMenu-12.1 {DrawMenuEntryIndicator - non-check or radio} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.2 {DrawMenuEntryIndicator - checkbutton - indicator off} {
+test unixMenu-12.2 {DrawMenuEntryIndicator - checkbutton - indicator off} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.3 {DrawMenuEntryIndicator - checkbutton - not selected} {
+test unixMenu-12.3 {DrawMenuEntryIndicator - checkbutton - not selected} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.4 {DrawMenuEntryIndicator - checkbutton - selected} {
+test unixMenu-12.4 {DrawMenuEntryIndicator - checkbutton - selected} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -252,21 +244,21 @@ test unixMenu-12.4 {DrawMenuEntryIndicator - checkbutton - selected} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.5 {DrawMenuEntryIndicator - radiobutton - indicator off} {
+test unixMenu-12.5 {DrawMenuEntryIndicator - radiobutton - indicator off} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo -indicatoron 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.6 {DrawMenuEntryIndicator - radiobutton - not selected} {
+test unixMenu-12.6 {DrawMenuEntryIndicator - radiobutton - not selected} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
-test unixMenu-12.7 {DrawMenuEntryIndicator - radiobutton - selected} {
+test unixMenu-12.7 {DrawMenuEntryIndicator - radiobutton - selected} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo
@@ -275,14 +267,14 @@ test unixMenu-12.7 {DrawMenuEntryIndicator - radiobutton - selected} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-13.1 {DrawMenuSeparator - menubar case} {
+test unixMenu-13.1 {DrawMenuSeparator - menubar case} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-13.2 {DrawMenuSepartor - normal menu} {
+test unixMenu-13.2 {DrawMenuSepartor - normal menu} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -290,7 +282,7 @@ test unixMenu-13.2 {DrawMenuSepartor - normal menu} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-14.1 {DrawMenuEntryLabel} {
+test unixMenu-14.1 {DrawMenuEntryLabel} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -298,14 +290,14 @@ test unixMenu-14.1 {DrawMenuEntryLabel} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-15.1 {DrawMenuUnderline - menubar} {
+test unixMenu-15.1 {DrawMenuUnderline - menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -underline 0
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-15.2 {DrawMenuUnderline - no menubar} {
+test unixMenu-15.2 {DrawMenuUnderline - no menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -underline 0
@@ -313,21 +305,21 @@ test unixMenu-15.2 {DrawMenuUnderline - no menubar} {
     list [catch {update} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test unixMenu-16.1 {TkpPostMenu} {
+test unixMenu-16.1 {TkpPostMenu} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test unixMenu-17.1 {GetMenuSeparatorGeometry} {
+test unixMenu-17.1 {GetMenuSeparatorGeometry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test unixMenu-18.1 {GetTearoffEntryGeometry} {
+test unixMenu-18.1 {GetTearoffEntryGeometry} unix {
     catch {destroy .m1}
     menubutton .mb -text "test" -menu .mb.m
     menu .mb.m
@@ -338,42 +330,42 @@ test unixMenu-18.1 {GetTearoffEntryGeometry} {
 } {0 {} {} {}}
 
 # Don't know how to reproduce the case where the tkwin has been deleted.
-test unixMenu-19.1 {TkpComputeMenubarGeometry - zero entries} {
+test unixMenu-19.1 {TkpComputeMenubarGeometry - zero entries} unix {
     catch {destroy .m1}
     menu .m1
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 # Don't know how to generate one width windows
-test unixMenu-19.2 {TkpComputeMenubarGeometry - one entry} {
+test unixMenu-19.2 {TkpComputeMenubarGeometry - one entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.3 {TkpComputeMenubarGeometry - entry with different font} {
+test unixMenu-19.3 {TkpComputeMenubarGeometry - entry with different font} unix {
     catch {destroy .m1}
     menu .m1 -font "Courier 24"
     .m1 add cascade -label File -font "Helvetica 18"
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.4 {TkpComputeMenubarGeometry - separator} {
+test unixMenu-19.4 {TkpComputeMenubarGeometry - separator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.5 {TkpComputeMenubarGeometry - First entry} {
+test unixMenu-19.5 {TkpComputeMenubarGeometry - First entry} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.6 {TkpComputeMenubarGeometry - First entry too wide} {
+test unixMenu-19.6 {TkpComputeMenubarGeometry - First entry too wide} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File -font "Times 72"
@@ -381,7 +373,7 @@ test unixMenu-19.6 {TkpComputeMenubarGeometry - First entry too wide} {
     wm geometry . 10x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.7 {TkpComputeMenubarGeometry - two entries fit} {
+test unixMenu-19.7 {TkpComputeMenubarGeometry - two entries fit} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File
@@ -390,7 +382,7 @@ test unixMenu-19.7 {TkpComputeMenubarGeometry - two entries fit} {
     wm geometry . 200x200
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.8 {TkpComputeMenubarGeometry - two entries; 2nd don't fit} {
+test unixMenu-19.8 {TkpComputeMenubarGeometry - two entries; 2nd don't fit} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File
@@ -399,7 +391,7 @@ test unixMenu-19.8 {TkpComputeMenubarGeometry - two entries; 2nd don't fit} {
     wm geometry . 100x100
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.9 {TkpComputeMenubarGeometry - two entries; 1st dont fit} {
+test unixMenu-19.9 {TkpComputeMenubarGeometry - two entries; 1st dont fit} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File -font "Times 72"
@@ -408,7 +400,7 @@ test unixMenu-19.9 {TkpComputeMenubarGeometry - two entries; 1st dont fit} {
     wm geometry . 100x100
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.10 {TkpComputeMenubarGeometry - two entries; neither fit} {
+test unixMenu-19.10 {TkpComputeMenubarGeometry - two entries; neither fit} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0 -font "Times 72"
     .m1 add cascade -label File
@@ -419,7 +411,7 @@ test unixMenu-19.10 {TkpComputeMenubarGeometry - two entries; neither fit} {
 } {0 {} {} {}}
 # ABC notation; capital A means first window fits, small a means it
 # does not. capital B menu means second window fist, etc.
-test unixMenu-19.11 {TkpComputeMenubarGeometry - abc} {
+test unixMenu-19.11 {TkpComputeMenubarGeometry - abc} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0 -font "Times 72"
     .m1 add cascade -label "aaaaa"
@@ -429,7 +421,7 @@ test unixMenu-19.11 {TkpComputeMenubarGeometry - abc} {
     wm geometry . 10x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.12 {TkpComputeMenubarGeometry - abC} {
+test unixMenu-19.12 {TkpComputeMenubarGeometry - abC} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "aaaaa" -font "Times 72"
@@ -439,7 +431,7 @@ test unixMenu-19.12 {TkpComputeMenubarGeometry - abC} {
     wm geometry . 10x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.13 {TkpComputeMenubarGeometry - aBc} {
+test unixMenu-19.13 {TkpComputeMenubarGeometry - aBc} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "aaaaa" -font "Times 72"
@@ -449,7 +441,7 @@ test unixMenu-19.13 {TkpComputeMenubarGeometry - aBc} {
     wm geometry . 10x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.14 {TkpComputeMenubarGeometry - aBC} {
+test unixMenu-19.14 {TkpComputeMenubarGeometry - aBC} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "aaaaa" -font "Times 72"
@@ -459,7 +451,7 @@ test unixMenu-19.14 {TkpComputeMenubarGeometry - aBC} {
     wm geometry . 60x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.15 {TkpComputeMenubarGeometry - Abc} {
+test unixMenu-19.15 {TkpComputeMenubarGeometry - Abc} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "A"
@@ -469,7 +461,7 @@ test unixMenu-19.15 {TkpComputeMenubarGeometry - Abc} {
     wm geometry . 60x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.16 {TkpComputeMenubarGeometry - AbC} {
+test unixMenu-19.16 {TkpComputeMenubarGeometry - AbC} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "A"
@@ -479,7 +471,7 @@ test unixMenu-19.16 {TkpComputeMenubarGeometry - AbC} {
     wm geometry . 60x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.17 {TkpComputeMenubarGeometry - ABc} {
+test unixMenu-19.17 {TkpComputeMenubarGeometry - ABc} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "A"
@@ -489,7 +481,7 @@ test unixMenu-19.17 {TkpComputeMenubarGeometry - ABc} {
     wm geometry . 60x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.18 {TkpComputeMenubarGeometry - ABC} {
+test unixMenu-19.18 {TkpComputeMenubarGeometry - ABC} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label "A"
@@ -499,7 +491,7 @@ test unixMenu-19.18 {TkpComputeMenubarGeometry - ABC} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.19 {TkpComputeMenubarGeometry - help menu in first position} {
+test unixMenu-19.19 {TkpComputeMenubarGeometry - help menu in first position} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label Help -menu .m1.help
@@ -512,7 +504,7 @@ test unixMenu-19.19 {TkpComputeMenubarGeometry - help menu in first position} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.20 {TkpComputeMenubarGeometry - help menu in middle} {
+test unixMenu-19.20 {TkpComputeMenubarGeometry - help menu in middle} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label Edit -menu .m1.edit
@@ -525,7 +517,7 @@ test unixMenu-19.20 {TkpComputeMenubarGeometry - help menu in middle} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.21 {TkpComputeMenubarGeometry - help menu in first position} {
+test unixMenu-19.21 {TkpComputeMenubarGeometry - help menu in first position} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -538,7 +530,7 @@ test unixMenu-19.21 {TkpComputeMenubarGeometry - help menu in first position} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.22 {TkpComputeMenubarGeometry - help item fits} {
+test unixMenu-19.22 {TkpComputeMenubarGeometry - help item fits} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -549,7 +541,7 @@ test unixMenu-19.22 {TkpComputeMenubarGeometry - help item fits} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.23 {TkpComputeMenubarGeometry - help item does not fit} {
+test unixMenu-19.23 {TkpComputeMenubarGeometry - help item does not fit} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -560,7 +552,7 @@ test unixMenu-19.23 {TkpComputeMenubarGeometry - help item does not fit} {
     wm geometry . 100x10
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-19.24 {TkpComputeMenubarGeometry - help item only one} {
+test unixMenu-19.24 {TkpComputeMenubarGeometry - help item only one} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label Help -menu .m1.help
@@ -570,14 +562,14 @@ test unixMenu-19.24 {TkpComputeMenubarGeometry - help item only one} {
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 
-test unixMenu-20.1 {DrawTearoffEntry - menubar} {
+test unixMenu-20.1 {DrawTearoffEntry - menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File
     . configure -menu .m1
     list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test unixMenu-20.2 {DrawTearoffEntry - non-menubar} {
+test unixMenu-20.2 {DrawTearoffEntry - non-menubar} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -587,28 +579,28 @@ test unixMenu-20.2 {DrawTearoffEntry - non-menubar} {
 
 test unixMenu-21.1 {TkpInitializeMenuBindings - nothing to do} {} {}
 
-test unixMenu-22.1 {SetHelpMenu - no menubars} {
+test unixMenu-22.1 {SetHelpMenu - no menubars} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label test -menu .m1.test
     list [catch {menu .m1.test} msg] $msg [destroy .m1]
 } {0 .m1.test {}}
 # Don't know how to automate missing tkwins
-test unixMenu-22.2 {SetHelpMenu - menubar but no help menu} {
+test unixMenu-22.2 {SetHelpMenu - menubar but no help menu} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     . configure -menu .m1
     .m1 add cascade -label .m1.file
     list [catch {menu .m1.file} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 .m1.file {} {}}
-test unixMenu-22.3 {SetHelpMenu - menubar with help menu} {
+test unixMenu-22.3 {SetHelpMenu - menubar with help menu} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     . configure -menu .m1
     .m1 add cascade -label .m1.help
     list [catch {menu .m1.help} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 .m1.help {} {}}
-test unixMenu-22.4 {SetHelpMenu - multiple menubars with same help menu} {
+test unixMenu-22.4 {SetHelpMenu - multiple menubars with same help menu} unix {
     catch {destroy .m1}
     catch {destroy .t2}
     toplevel .t2
@@ -620,7 +612,7 @@ test unixMenu-22.4 {SetHelpMenu - multiple menubars with same help menu} {
     list [catch {menu .m1.help} msg] $msg [. configure -menu ""] [destroy .m1] [destroy .t2]
 } {0 .m1.help {} {} {}}
 
-test unixMenu-23.1 {TkpDrawMenuEntry - gc for active and not strict motif} {
+test unixMenu-23.1 {TkpDrawMenuEntry - gc for active and not strict motif} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -628,7 +620,7 @@ test unixMenu-23.1 {TkpDrawMenuEntry - gc for active and not strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} {
+test unixMenu-23.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground red
@@ -636,7 +628,7 @@ test unixMenu-23.2 {TkpDrawMenuEntry - gc for active menu item with its own gc}
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.3 {TkpDrawMenuEntry - gc for active and strict motif} {
+test unixMenu-23.3 {TkpDrawMenuEntry - gc for active and strict motif} unix {
     catch {destroy .m1}
     menu .m1
     set tk_strictMotif 1
@@ -645,42 +637,42 @@ test unixMenu-23.3 {TkpDrawMenuEntry - gc for active and strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } {{} {} 0}
-test unixMenu-23.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} {
+test unixMenu-23.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} unix {
     catch {destroy .m1}
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled -background red
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} {
+test unixMenu-23.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} unix {
     catch {destroy .m1}
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} {
+test unixMenu-23.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} unix {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.7 {TkpDrawMenuEntry - gc for normal - custom entry} {
+test unixMenu-23.7 {TkpDrawMenuEntry - gc for normal - custom entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -foreground red
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.8 {TkpDrawMenuEntry - gc for normal} {
+test unixMenu-23.8 {TkpDrawMenuEntry - gc for normal} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {
+test unixMenu-23.9 {TkpDrawMenuEntry - gc for indicator - custom entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -selectcolor orange
@@ -688,7 +680,7 @@ test unixMenu-23.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.10 {TkpDrawMenuEntry - gc for indicator} {
+test unixMenu-23.10 {TkpDrawMenuEntry - gc for indicator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -696,7 +688,7 @@ test unixMenu-23.10 {TkpDrawMenuEntry - gc for indicator} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.11 {TkpDrawMenuEntry - border - custom entry} {
+test unixMenu-23.11 {TkpDrawMenuEntry - border - custom entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activebackground green
@@ -704,7 +696,7 @@ test unixMenu-23.11 {TkpDrawMenuEntry - border - custom entry} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.12 {TkpDrawMenuEntry - border} {
+test unixMenu-23.12 {TkpDrawMenuEntry - border} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -712,7 +704,7 @@ test unixMenu-23.12 {TkpDrawMenuEntry - border} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.13 {TkpDrawMenuEntry - active border - strict motif} {
+test unixMenu-23.13 {TkpDrawMenuEntry - active border - strict motif} unix {
     catch {destroy .m1}
     set tk_strictMotif 1
     menu .m1
@@ -721,7 +713,7 @@ test unixMenu-23.13 {TkpDrawMenuEntry - active border - strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } {{} {} 0}
-test unixMenu-23.14 {TkpDrawMenuEntry - active border - custom entry} {
+test unixMenu-23.14 {TkpDrawMenuEntry - active border - custom entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground yellow
@@ -729,7 +721,7 @@ test unixMenu-23.14 {TkpDrawMenuEntry - active border - custom entry} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.15 {TkpDrawMenuEntry - active border} {
+test unixMenu-23.15 {TkpDrawMenuEntry - active border} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -737,35 +729,35 @@ test unixMenu-23.15 {TkpDrawMenuEntry - active border} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.16 {TkpDrawMenuEntry - font - custom entry} {
+test unixMenu-23.16 {TkpDrawMenuEntry - font - custom entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -font "Helvectica 72"
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.17 {TkpDrawMenuEntry - font} {
+test unixMenu-23.17 {TkpDrawMenuEntry - font} unix {
     catch {destroy .m1}
     menu .m1 -font "Courier 72"
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.18 {TkpDrawMenuEntry - separator} {
+test unixMenu-23.18 {TkpDrawMenuEntry - separator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.19 {TkpDrawMenuEntry - standard} {
+test unixMenu-23.19 {TkpDrawMenuEntry - standard} unix {
     catch {destroy .mb}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.20 {TkpDrawMenuEntry - disabled cascade item} {
+test unixMenu-23.20 {TkpDrawMenuEntry - disabled cascade item} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File -menu .m1.file
@@ -775,7 +767,7 @@ test unixMenu-23.20 {TkpDrawMenuEntry - disabled cascade item} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.21 {TkpDrawMenuEntry - indicator} {
+test unixMenu-23.21 {TkpDrawMenuEntry - indicator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label Foo
@@ -783,7 +775,7 @@ test unixMenu-23.21 {TkpDrawMenuEntry - indicator} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test unixMenu-23.22 {TkpDrawMenuEntry - hide margin} {
+test unixMenu-23.22 {TkpDrawMenuEntry - hide margin} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label Foo -hidemargin 1
@@ -792,7 +784,7 @@ test unixMenu-23.22 {TkpDrawMenuEntry - hide margin} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test unixMenu-24.1 {GetMenuLabelGeometry - image} {
+test unixMenu-24.1 {GetMenuLabelGeometry - image} {testImageType unix} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
@@ -800,44 +792,44 @@ test unixMenu-24.1 {GetMenuLabelGeometry - image} {
     .m1 add command -image image1
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test unixMenu-24.2 {GetMenuLabelGeometry - bitmap} {
+test unixMenu-24.2 {GetMenuLabelGeometry - bitmap} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -bitmap questhead
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-24.3 {GetMenuLabelGeometry - no text} {
+test unixMenu-24.3 {GetMenuLabelGeometry - no text} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-24.4 {GetMenuLabelGeometry - text} {
+test unixMenu-24.4 {GetMenuLabelGeometry - text} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "This is a test."
     list [update idletasks] [destroy .m1]
 } {{} {}}
 
-test unixMenu-25.1 {TkpComputeStandardMenuGeometry - no entries} {
+test unixMenu-25.1 {TkpComputeStandardMenuGeometry - no entries} unix {
     catch {destroy .m1}
     menu .m1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.2 {TkpComputeStandardMenuGeometry - one entry} {
+test unixMenu-25.2 {TkpComputeStandardMenuGeometry - one entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.3 {TkpComputeStandardMenuGeometry - more than one entry} {
+test unixMenu-25.3 {TkpComputeStandardMenuGeometry - more than one entry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     .m1 add command -label "two"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.4 {TkpComputeStandardMenuGeometry - separator} {
+test unixMenu-25.4 {TkpComputeStandardMenuGeometry - separator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -852,60 +844,60 @@ test unixMenu-25.5 {TkpComputeStandardMenuGeometry - tearoff entry} {unixOnly} {
     catch {tk::MbPost .mb}
     list [update] [tk::MenuUnpost .mb.m] [destroy .mb]
 } {{} {} {}}
-test unixMenu-25.6 {TkpComputeStandardMenuGeometry - standard label geometry} {
+test unixMenu-25.6 {TkpComputeStandardMenuGeometry - standard label geometry} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.7 {TkpComputeStandardMenuGeometry - different font for entry} {
+test unixMenu-25.7 {TkpComputeStandardMenuGeometry - different font for entry} unix {
     catch {destroy .m1}
     menu .m1 -font "Helvetica 12"
     .m1 add command -label "test" -font "Courier 12"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.8 {TkpComputeStandardMenuGeometry - second entry larger} {
+test unixMenu-25.8 {TkpComputeStandardMenuGeometry - second entry larger} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     .m1 add command -label "test test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.9 {TkpComputeStandardMenuGeometry - first entry larger} {
+test unixMenu-25.9 {TkpComputeStandardMenuGeometry - first entry larger} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test test"
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.10 {TkpComputeStandardMenuGeometry - accelerator} {
+test unixMenu-25.10 {TkpComputeStandardMenuGeometry - accelerator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test" -accel "Ctrl+S"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.11 {TkpComputeStandardMenuGeometry - second accel larger} {
+test unixMenu-25.11 {TkpComputeStandardMenuGeometry - second accel larger} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test" -accel "1"
     .m1 add command -label "test" -accel "1 1"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.12 {TkpComputeStandardMenuGeometry - second accel smaller} {
+test unixMenu-25.12 {TkpComputeStandardMenuGeometry - second accel smaller} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test" -accel "1 1"
     .m1 add command -label "test" -accel "1"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.13 {TkpComputeStandardMenuGeometry - indicator} {
+test unixMenu-25.13 {TkpComputeStandardMenuGeometry - indicator} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label test
     .m1 invoke 1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.14 {TkpComputeStandardMenuGeometry - second indicator less or equal } {
+test unixMenu-25.14 {TkpComputeStandardMenuGeometry - second indicator less or equal } {unix testImageType} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -916,7 +908,7 @@ test unixMenu-25.14 {TkpComputeStandardMenuGeometry - second indicator less or e
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test unixMenu-25.15 {TkpComputeStandardMenuGeometry - second indicator larger } {unixOnly} {
+test unixMenu-25.15 {TkpComputeStandardMenuGeometry - second indicator larger } {unixOnly testImageType} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -927,12 +919,12 @@ test unixMenu-25.15 {TkpComputeStandardMenuGeometry - second indicator larger }
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test unixMenu-25.16 {TkpComputeStandardMenuGeometry - zero sized menus} {
+test unixMenu-25.16 {TkpComputeStandardMenuGeometry - zero sized menus} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.17 {TkpComputeStandardMenuGeometry - first column bigger} {
+test unixMenu-25.17 {TkpComputeStandardMenuGeometry - first column bigger} unix {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label one
@@ -940,7 +932,7 @@ test unixMenu-25.17 {TkpComputeStandardMenuGeometry - first column bigger} {
     .m1 add command -label three -columnbreak 1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.18 {TkpComputeStandardMenuGeometry - second column bigger} {
+test unixMenu-25.18 {TkpComputeStandardMenuGeometry - second column bigger} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -948,7 +940,7 @@ test unixMenu-25.18 {TkpComputeStandardMenuGeometry - second column bigger} {
     .m1 add command -label three
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} {
+test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -959,7 +951,7 @@ test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} {
     .m1 add command -label six
     list [update idletasks] [destroy .m1]    
 } {{} {}}
-test unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} {
+test unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} unix {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add checkbutton -label one -hidemargin 1