improved use of test constraints

1 files changed, 382 insertions, 408 deletions

diff --git a/tests/send.test b/tests/send.test
index c2263c2..9efd4bd 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -5,9 +5,12 @@
 # Copyright (c) 1994 Sun Microsystems, Inc.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
+# Copyright (c) 2001 by ActiveState Corporation.
 #
-# RCS: @(#) $Id: send.test,v 1.4 2001/08/30 01:51:42 hobbs Exp $
+# See the file "license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#
+# RCS: @(#) $Id: send.test,v 1.5 2001/09/21 20:38:18 hobbs Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -15,30 +18,10 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
 
 # 'send' is only available on Unix...
 
-if {$tcl_platform(platform) == "macintosh"} {
-    puts "send is not available on the Mac - skipping tests"
-    ::tcltest::cleanupTests
-    return
-}
-if {$tcl_platform(platform) == "window"} {
-    puts "send is not available under Windows - skipping tests"
-    ::tcltest::cleanupTests
-    return
-}
-if {[auto_execok xhost] == ""} {
-    puts "xhost application isn't available - skipping tests"
-    ::tcltest::cleanupTests
-    return
-}
-
+set ::tcltest::testConfig(xhost) [string compare {} [auto_execok xhost]]
+set ::tcltest::testConfig(testsend) [llength [info commands testsend]]
 set ::tcltest::testConfig(altDisplay) [info exists env(TK_ALT_DISPLAY)]
 
-if {[info commands testsend] == "testsend"} {
-    set gotTestCmds 1
-} else {
-    set gotTestCmds 0
-}
-
 foreach i [winfo children .] {
     destroy $i
 }
@@ -51,9 +34,9 @@ raise .
 setupbg
 set app [dobg {tk appname}]
 if {[catch {send $app set a 0} msg] == 1} {
-    if [string match "X server insecure *" $msg] {
-	puts -nonewline "Your X server is insecure, so \"send\" can't be used;"
-	puts " skipping \"send\" tests."
+    if {[string match "X server insecure *" $msg]} {
+	puts "Your X server is insecure - \"send\" can't be used;\
+		skipping \"send\" tests."
 	cleanupbg
 	::tcltest::cleanupTests
 	return
@@ -80,7 +63,7 @@ proc newApp {screen name class} {
 }
 
 set name [tk appname]
-if $gotTestCmds {
+catch {
     set registry [testsend prop root InterpRegistry]
     set commId [lindex [testsend prop root InterpRegistry] 0]
 }
@@ -88,161 +71,160 @@ tk appname tktest
 catch {send t_s_1 destroy .}
 catch {send t_s_2 destroy .}
 
-if $gotTestCmds {
-    test send-1.1 {RegOpen procedure, bogus property} {
-	testsend bogus
-	set result [winfo interps]
-	tk appname tktest
-	list $result [winfo interps]
-    } {{} tktest}
-    test send-1.2 {RegOpen procedure, bogus property} {
-	testsend prop root InterpRegistry {}
-	set result [winfo interps]
-	tk appname tktest
-	list $result [winfo interps]
-    } {{} tktest}
-    test send-1.3 {RegOpen procedure, bogus property} {
-	testsend prop root InterpRegistry abcdefg
-	tk appname tktest
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " tktest\nabcdefg\n"
-
-    frame .f -width 1 -height 1
-    set id [string range [winfo id .f] 2 end]
-    test send-2.1 {RegFindName procedure} {
-	testsend prop root InterpRegistry {}
-	list [catch {send foo bar} msg] $msg
-    } {1 {no application named "foo"}}
-    test send-2.2 {RegFindName procedure} {
-	testsend prop root InterpRegistry " abc\n def\nghi\n\n$id foo\n"
-	tk appname foo
-    } {foo #2}
-    test send-2.3 {RegFindName procedure} {
-	testsend prop root InterpRegistry "gyz foo\n"
-	tk appname foo
-    } {foo}
-    test send-2.4 {RegFindName procedure} {
-	testsend prop root InterpRegistry "${id}z foo\n"
-	tk appname foo
-    } {foo}
-
-    test send-3.1 {RegDeleteName procedure} {
-	tk appname tktest
-	testsend prop root InterpRegistry "012345 gorp\n12345 foo\n12345 tktest"
-	tk appname x
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " x\n012345 gorp\n12345 foo\n"
-    test send-3.2 {RegDeleteName procedure} {
-	tk appname tktest
-	testsend prop root InterpRegistry "012345 gorp\n12345 tktest\n23456 tktest"
-	tk appname x
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " x\n012345 gorp\n23456 tktest\n"
-    test send-3.3 {RegDeleteName procedure} {
-	tk appname tktest
-	testsend prop root InterpRegistry "012345 tktest\n12345 bar\n23456 tktest"
-	tk appname x
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " x\n12345 bar\n23456 tktest\n"
-    test send-3.4 {RegDeleteName procedure} {
-	tk appname tktest
-	testsend prop root InterpRegistry "foo"
-	tk appname x
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " x\nfoo\n"
-    test send-3.5 {RegDeleteName procedure} {
-	tk appname tktest
-	testsend prop root InterpRegistry ""
-	tk appname x
-	set x [testsend prop root InterpRegistry]
-	string range $x [string first " " $x] end
-    } " x\n"
-
-    test send-4.1 {RegAddName procedure} {
-	testsend prop root InterpRegistry ""
-	tk appname bar
-	testsend prop root InterpRegistry
-    } "$commId bar\n"
-    test send-4.2 {RegAddName procedure} {
-	testsend prop root InterpRegistry "abc def"
-	tk appname bar
-	tk appname foo
-	testsend prop root InterpRegistry
-    } "$commId foo\nabc def\n"
-
-    # Previous checks should already cover the Regclose procedure.
-
-    test send-5.1 {ValidateName procedure} {
-	testsend prop root InterpRegistry "123 abc\n"
-	winfo interps
-    } {}
-    test send-5.2 {ValidateName procedure} {
-	testsend prop root InterpRegistry "$id Hi there"
-	winfo interps
-    } {{Hi there}}
-    test send-5.3 {ValidateName procedure} {
-	testsend prop root InterpRegistry "$id Bogus"
-	list [catch {send Bogus set a 44} msg] $msg
-    } {1 {target application died or uses a Tk version before 4.0}}
-    test send-5.4 {ValidateName procedure} {
-	tk appname test
-	testsend prop root InterpRegistry "$commId Bogus\n$commId test\n"
-	winfo interps
-    } {test}
-}
+test send-1.1 {RegOpen procedure, bogus property} {unixOnly testsend} {
+    testsend bogus
+    set result [winfo interps]
+    tk appname tktest
+    list $result [winfo interps]
+} {{} tktest}
+test send-1.2 {RegOpen procedure, bogus property} {unixOnly testsend} {
+    testsend prop root InterpRegistry {}
+    set result [winfo interps]
+    tk appname tktest
+    list $result [winfo interps]
+} {{} tktest}
+test send-1.3 {RegOpen procedure, bogus property} {unixOnly testsend} {
+    testsend prop root InterpRegistry abcdefg
+    tk appname tktest
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " tktest\nabcdefg\n"
 
-winfo interps
-tk appname tktest
-update
-setupbg
-set x [split [exec xhost] \n]
-foreach i [lrange $x 1 end]  {
-    exec xhost - $i
+frame .f -width 1 -height 1
+set id [string range [winfo id .f] 2 end]
+test send-2.1 {RegFindName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry {}
+    list [catch {send foo bar} msg] $msg
+} {1 {no application named "foo"}}
+test send-2.2 {RegFindName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry " abc\n def\nghi\n\n$id foo\n"
+    tk appname foo
+} {foo #2}
+test send-2.3 {RegFindName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "gyz foo\n"
+    tk appname foo
+} {foo}
+test send-2.4 {RegFindName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "${id}z foo\n"
+    tk appname foo
+} {foo}
+
+test send-3.1 {RegDeleteName procedure} {unixOnly testsend} {
+    tk appname tktest
+    testsend prop root InterpRegistry "012345 gorp\n12345 foo\n12345 tktest"
+    tk appname x
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " x\n012345 gorp\n12345 foo\n"
+test send-3.2 {RegDeleteName procedure} {unixOnly testsend} {
+    tk appname tktest
+    testsend prop root InterpRegistry "012345 gorp\n12345 tktest\n23456 tktest"
+    tk appname x
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " x\n012345 gorp\n23456 tktest\n"
+test send-3.3 {RegDeleteName procedure} {unixOnly testsend} {
+    tk appname tktest
+    testsend prop root InterpRegistry "012345 tktest\n12345 bar\n23456 tktest"
+    tk appname x
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " x\n12345 bar\n23456 tktest\n"
+test send-3.4 {RegDeleteName procedure} {unixOnly testsend} {
+    tk appname tktest
+    testsend prop root InterpRegistry "foo"
+    tk appname x
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " x\nfoo\n"
+test send-3.5 {RegDeleteName procedure} {unixOnly testsend} {
+    tk appname tktest
+    testsend prop root InterpRegistry ""
+    tk appname x
+    set x [testsend prop root InterpRegistry]
+    string range $x [string first " " $x] end
+} " x\n"
+
+test send-4.1 {RegAddName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry ""
+    tk appname bar
+    testsend prop root InterpRegistry
+} "$commId bar\n"
+test send-4.2 {RegAddName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "abc def"
+    tk appname bar
+    tk appname foo
+    testsend prop root InterpRegistry
+} "$commId foo\nabc def\n"
+
+# Previous checks should already cover the Regclose procedure.
+
+test send-5.1 {ValidateName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "123 abc\n"
+    winfo interps
+} {}
+test send-5.2 {ValidateName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "$id Hi there"
+    winfo interps
+} {{Hi there}}
+test send-5.3 {ValidateName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "$id Bogus"
+    list [catch {send Bogus set a 44} msg] $msg
+} {1 {target application died or uses a Tk version before 4.0}}
+test send-5.4 {ValidateName procedure} {unixOnly testsend} {
+    tk appname test
+    testsend prop root InterpRegistry "$commId Bogus\n$commId test\n"
+    winfo interps
+} {test}
+
+if {$::tcltest::testConfig(xhost)} {
+    winfo interps
+    tk appname tktest
+    update
+    setupbg
+    set x [split [exec xhost] \n]
+    foreach i [lrange $x 1 end]  {
+	exec xhost - $i
+    }
 }
-test send-6.1 {ServerSecure procedure} {nonPortable} {
+
+test send-6.1 {ServerSecure procedure} {nonPortable unixOnly} {
     set a 44
     list [dobg [list send [tk appname] set a 55]] $a
 } {55 55}
-test send-6.2 {ServerSecure procedure} {nonPortable} {
+test send-6.2 {ServerSecure procedure} {nonPortable unixOnly} {
     set a 22
     exec xhost [exec hostname]
     list [catch {dobg [list send [tk appname] set a 33]} msg] $a $msg
 } {0 22 {X server insecure (must use xauth-style authorization); command ignored}}
-test send-6.3 {ServerSecure procedure} {nonPortable} {
+test send-6.3 {ServerSecure procedure} {nonPortable unixOnly} {
     set a abc
     exec xhost - [exec hostname]
     list [dobg [list send [tk appname] set a new]] $a
 } {new new}
 cleanupbg
 
-if $gotTestCmds {
-    test send-7.1 {Tk_SetAppName procedure} {
-	testsend prop root InterpRegistry ""
-	tk appname newName
-	list [tk appname oldName] [testsend prop root InterpRegistry]
-    } "oldName {$commId oldName\n}"
-    test send-7.2 {Tk_SetAppName procedure, name not in use} {
-	testsend prop root InterpRegistry ""
-	list [tk appname gorp] [testsend prop root InterpRegistry]
-    } "gorp {$commId gorp\n}"
-    test send-7.3 {Tk_SetAppName procedure, name in use by us} {
-	tk appname name1
-	testsend prop root InterpRegistry "$commId name2\n"
-	list [tk appname name2] [testsend prop root InterpRegistry]
-    } "name2 {$commId name2\n}"
-    test send-7.4 {Tk_SetAppName procedure, name in use} {
-	tk appname name1
-	testsend prop root InterpRegistry "$id foo\n$id foo #2\n$id foo #3\n"
-	list [tk appname foo] [testsend prop root InterpRegistry]
-    } "{foo #4} {$commId foo #4\n$id foo\n$id foo #2\n$id foo #3\n}"
-}
-
-test send-8.1 {Tk_SendCmd procedure, options} {
+test send-7.1 {Tk_SetAppName procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry ""
+    tk appname newName
+    list [tk appname oldName] [testsend prop root InterpRegistry]
+} "oldName {$commId oldName\n}"
+test send-7.2 {Tk_SetAppName procedure, name not in use} {unixOnly testsend} {
+    testsend prop root InterpRegistry ""
+    list [tk appname gorp] [testsend prop root InterpRegistry]
+} "gorp {$commId gorp\n}"
+test send-7.3 {Tk_SetAppName procedure, name in use by us} {unixOnly testsend} {
+    tk appname name1
+    testsend prop root InterpRegistry "$commId name2\n"
+    list [tk appname name2] [testsend prop root InterpRegistry]
+} "name2 {$commId name2\n}"
+test send-7.4 {Tk_SetAppName procedure, name in use} {unixOnly testsend} {
+    tk appname name1
+    testsend prop root InterpRegistry "$id foo\n$id foo #2\n$id foo #3\n"
+    list [tk appname foo] [testsend prop root InterpRegistry]
+} "{foo #4} {$commId foo #4\n$id foo\n$id foo #2\n$id foo #3\n}"
+
+test send-8.1 {Tk_SendCmd procedure, options} {unixOnly} {
     setupbg
     set app [dobg {tk appname}]
     set a 66
@@ -253,7 +235,7 @@ test send-8.1 {Tk_SendCmd procedure, options} {
     cleanupbg
     lappend result $a
 } {66 77}
-test send-8.2 {Tk_SendCmd procedure, options} {altDisplay} {
+test send-8.2 {Tk_SendCmd procedure, options} {unixOnly altDisplay} {
     setupbg -display $env(TK_ALT_DISPLAY)
     tk appname xyzgorp
     set a homeDisplay
@@ -267,29 +249,29 @@ test send-8.2 {Tk_SendCmd procedure, options} {altDisplay} {
     cleanupbg
     set result
 } {altDisplay homeDisplay}
-test send-8.3 {Tk_SendCmd procedure, options} {
+test send-8.3 {Tk_SendCmd procedure, options} {unixOnly} {
     list [catch {send -- -async foo bar baz} msg] $msg
 } {1 {no application named "-async"}}
-test send-8.4 {Tk_SendCmd procedure, options} {
+test send-8.4 {Tk_SendCmd procedure, options} {unixOnly} {
     list [catch {send -gorp foo bar baz} msg] $msg
 } {1 {bad option "-gorp": must be -async, -displayof, or --}}
-test send-8.5 {Tk_SendCmd procedure, options} {
+test send-8.5 {Tk_SendCmd procedure, options} {unixOnly} {
     list [catch {send -async foo} msg] $msg
 } {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
-test send-8.6 {Tk_SendCmd procedure, options} {
+test send-8.6 {Tk_SendCmd procedure, options} {unixOnly} {
     list [catch {send foo} msg] $msg
 } {1 {wrong # args: should be "send ?options? interpName arg ?arg ...?"}}
-test send-8.7 {Tk_SendCmd procedure, local execution} {
+test send-8.7 {Tk_SendCmd procedure, local execution} {unixOnly} {
     set a initial
     send [tk appname] {set a new}
     set a
 } {new}
-test send-8.8 {Tk_SendCmd procedure, local execution} {
+test send-8.8 {Tk_SendCmd procedure, local execution} {unixOnly} {
     set a initial
     send [tk appname] set a new
     set a
 } {new}
-test send-8.9 {Tk_SendCmd procedure, local execution} {
+test send-8.9 {Tk_SendCmd procedure, local execution} {unixOnly} {
     set a initial
     string tolower [list [catch {send [tk appname] open bad_file} msg] \
 	    $msg $errorInfo $errorCode]
@@ -298,52 +280,58 @@ test send-8.9 {Tk_SendCmd procedure, local execution} {
 "open bad_file"
     invoked from within
 "send [tk appname] open bad_file"} {posix enoent {no such file or directory}}}
-test send-8.10 {Tk_SendCmd procedure, no such interpreter} {
+test send-8.10 {Tk_SendCmd procedure, no such interpreter} {unixOnly} {
     list [catch {send bogus_name bogus_command} msg] $msg
 } {1 {no application named "bogus_name"}}
-if $gotTestCmds {
+
+catch {
     newApp "" t_s_1 Test
     t_s_1 eval wm withdraw .
-    test send-8.11 {Tk_SendCmd procedure, local execution, different interp} {
-	set a us
-	send t_s_1 set a them
-	list $a [send t_s_1 set a]
-    } {us them}
-    test send-8.12 {Tk_SendCmd procedure, local execution, different interp} {
-	set a us
-	send t_s_1 {set a them}
-	list $a [send t_s_1 {set a}]
-    } {us them}
-    test send-8.13 {Tk_SendCmd procedure, local execution, different interp} {
-	set a us
-	send t_s_1 {set a them}
-	list $a [send t_s_1 {set a}]
-    } {us them}
-    test send-8.14 {Tk_SendCmd procedure, local interp killed by send} {
-	newApp "" t_s_2 Test
-	list [catch {send t_s_2 {destroy .; concat result}} msg] $msg
-    } {0 result}
-    interp delete t_s_2
-    test send-8.15 {Tk_SendCmd procedure, local interp, error info} {
-	catch {error foo}
-	list [catch {send t_s_1 {if 1 {open bogus_file_name}}} msg] $msg $errorInfo $errorCode
-    } {1 {couldn't open "bogus_file_name": no such file or directory} {couldn't open "bogus_file_name": no such file or directory
+}
+
+test send-8.11 {Tk_SendCmd procedure, local execution, different interp} {unixOnly testsend} {
+    set a us
+    send t_s_1 set a them
+    list $a [send t_s_1 set a]
+} {us them}
+test send-8.12 {Tk_SendCmd procedure, local execution, different interp} {unixOnly testsend} {
+    set a us
+    send t_s_1 {set a them}
+    list $a [send t_s_1 {set a}]
+} {us them}
+test send-8.13 {Tk_SendCmd procedure, local execution, different interp} {unixOnly testsend} {
+    set a us
+    send t_s_1 {set a them}
+    list $a [send t_s_1 {set a}]
+} {us them}
+test send-8.14 {Tk_SendCmd procedure, local interp killed by send} {unixOnly testsend} {
+    newApp "" t_s_2 Test
+    list [catch {send t_s_2 {destroy .; concat result}} msg] $msg
+} {0 result}
+
+catch {interp delete t_s_2}
+
+test send-8.15 {Tk_SendCmd procedure, local interp, error info} {unixOnly testsend} {
+    catch {error foo}
+    list [catch {send t_s_1 {if 1 {open bogus_file_name}}} msg] $msg $errorInfo $errorCode
+} {1 {couldn't open "bogus_file_name": no such file or directory} {couldn't open "bogus_file_name": no such file or directory
     while executing
 "open bogus_file_name"
     invoked from within
 "if 1 {open bogus_file_name}"
     invoked from within
 "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}}
-    test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {
-	testsend prop root InterpRegistry "10234 bogus\n"
-	set result [list [catch {send bogus bogus command} msg] $msg]
-	winfo interps
-	tk appname tktest
-	set result
-    } {1 {no application named "bogus"}}
-    interp delete t_s_1
-}
-test send-8.17 {Tk_SendCmd procedure, deferring events} {nonPortable} {
+test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {unixOnly testsend} {
+    testsend prop root InterpRegistry "10234 bogus\n"
+    set result [list [catch {send bogus bogus command} msg] $msg]
+    winfo interps
+    tk appname tktest
+    set result
+} {1 {no application named "bogus"}}
+
+catch {interp delete t_s_1}
+
+test send-8.17 {Tk_SendCmd procedure, deferring events} {unixOnly nonPortable} {
     # Non-portable because some window managers ignore "raise"
     # requests so can't guarantee that new app's window won't
     # obscure .f, thereby masking the Expose event.
@@ -363,7 +351,7 @@ test send-8.17 {Tk_SendCmd procedure, deferring events} {nonPortable} {
     cleanupbg
     lappend result $a
 } {{no event yet} {no event yet} exposed}
-test send-8.18 {Tk_SendCmd procedure, error in remote app} {
+test send-8.18 {Tk_SendCmd procedure, error in remote app} {unixOnly} {
     setupbg
     set app [dobg {tk appname}]
     set result [string tolower [list [catch {send $app open bad_name} msg] \
@@ -375,7 +363,7 @@ test send-8.18 {Tk_SendCmd procedure, error in remote app} {
 "open bad_name"
     invoked from within
 "send $app open bad_name"} {posix enoent {no such file or directory}}}
-test send-8.19 {Tk_SendCmd, using modal timeouts} {
+test send-8.19 {Tk_SendCmd, using modal timeouts} {unixOnly} {
     setupbg
     set app [dobg {tk appname}]
     set x no
@@ -392,74 +380,75 @@ tk appname tktest
 catch {destroy .f}
 frame .f
 set id [string range [winfo id .f] 2 end]
-if $gotTestCmds {
-    test send-9.1 {Tk_GetInterpNames procedure} {
-	testsend prop root InterpRegistry \
-		"$commId tktest\nfoo bar\n$commId tktest\n$id frame .f\n\n\n"
-	list [winfo interps] [testsend prop root InterpRegistry]
-    } "{tktest tktest {frame .f}} {$commId tktest\n$commId tktest\n$id frame .f
+
+test send-9.1 {Tk_GetInterpNames procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry \
+	    "$commId tktest\nfoo bar\n$commId tktest\n$id frame .f\n\n\n"
+    list [winfo interps] [testsend prop root InterpRegistry]
+} "{tktest tktest {frame .f}} {$commId tktest\n$commId tktest\n$id frame .f
 }"
-    test send-9.2 {Tk_GetInterpNames procedure} {
-	testsend prop root InterpRegistry \
-		"$commId tktest\nfoobar\n$commId gorp\n"
-	list [winfo interps] [testsend prop root InterpRegistry]
-    } "tktest {$commId tktest\n}"
-    test send-9.3 {Tk_GetInterpNames procedure} {
-	testsend prop root InterpRegistry {}
-	list [winfo interps] [testsend prop root InterpRegistry]
-    } {{} {}}
-
-    testsend prop root InterpRegistry "$commId tktest\n$id dummy\n"
-    test send-10.1 {SendEventProc procedure, bogus comm property} {
-	testsend prop comm Comm {abc def}
-	testsend prop comm Comm {}
-	update
-    } {}
-    test send-10.2 {SendEventProc procedure, simultaneous messages} {
-	testsend prop comm Comm \
-		"c\n-n tktest\n-s set a 44\nc\n-n tktest\n-s set b 45\n"
-	set a null
-	set b xyzzy
-	update
-	list $a $b
-    } {44 45}
-    test send-10.3 {SendEventProc procedure, simultaneous messages} {
-	testsend prop comm Comm \
-		"c\n-n tktest\n-s set a newA\nr\n-s [testsend serial]\n-r 12345\nc\n-n tktest\n-s set b newB\n"
-	set a null
-	set b xyzzy
-	set x [send dummy bogus]
-	list $x $a $b
-    } {12345 newA newB}
-    test send-10.4 {SendEventProc procedure, leading nulls, bogus commands} {
-	testsend prop comm Comm \
-		"\n\nx\n-bogus\n\nc\n-n tktest\n-s set a 44\n"
-	set a null
-	update
-	set a
-    } {44}
-    test send-10.5 {SendEventProc procedure, extraneous command options} {
-	testsend prop comm Comm \
-		"c\n-n tktest\n-x miscellanous\n-y who knows?\n-s set a new\n"
-	set a null
-	update
-	set a
-    } {new}
-    test send-10.6 {SendEventProc procedure, unknown interpreter} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n unknown\n-r $id 44\n-s set a new\n"
-	set a null
-	update
-	list [testsend prop [winfo id .f] Comm] $a
-    } "{\nr\n-s 44\n-r receiver never heard of interpreter \"unknown\"\n-c 1\n} null"
-    test send-10.7 {SendEventProc procedure, error in script} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-r $id 62\n-s foreach i {1 2 3} {error {test error} {Initial errorInfo} {test code}}\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {
+test send-9.2 {Tk_GetInterpNames procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry \
+	    "$commId tktest\nfoobar\n$commId gorp\n"
+    list [winfo interps] [testsend prop root InterpRegistry]
+} "tktest {$commId tktest\n}"
+test send-9.3 {Tk_GetInterpNames procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry {}
+    list [winfo interps] [testsend prop root InterpRegistry]
+} {{} {}}
+
+catch {testsend prop root InterpRegistry "$commId tktest\n$id dummy\n"}
+
+test send-10.1 {SendEventProc procedure, bogus comm property} {unixOnly testsend} {
+    testsend prop comm Comm {abc def}
+    testsend prop comm Comm {}
+    update
+} {}
+test send-10.2 {SendEventProc procedure, simultaneous messages} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-s set a 44\nc\n-n tktest\n-s set b 45\n"
+    set a null
+    set b xyzzy
+    update
+    list $a $b
+} {44 45}
+test send-10.3 {SendEventProc procedure, simultaneous messages} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-s set a newA\nr\n-s [testsend serial]\n-r 12345\nc\n-n tktest\n-s set b newB\n"
+    set a null
+    set b xyzzy
+    set x [send dummy bogus]
+    list $x $a $b
+} {12345 newA newB}
+test send-10.4 {SendEventProc procedure, leading nulls, bogus commands} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "\n\nx\n-bogus\n\nc\n-n tktest\n-s set a 44\n"
+    set a null
+    update
+    set a
+} {44}
+test send-10.5 {SendEventProc procedure, extraneous command options} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-x miscellanous\n-y who knows?\n-s set a new\n"
+    set a null
+    update
+    set a
+} {new}
+test send-10.6 {SendEventProc procedure, unknown interpreter} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n unknown\n-r $id 44\n-s set a new\n"
+    set a null
+    update
+    list [testsend prop [winfo id .f] Comm] $a
+} "{\nr\n-s 44\n-r receiver never heard of interpreter \"unknown\"\n-c 1\n} null"
+test send-10.7 {SendEventProc procedure, error in script} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-r $id 62\n-s foreach i {1 2 3} {error {test error} {Initial errorInfo} {test code}}\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {
 r
 -s 62
 -r test error
@@ -470,117 +459,117 @@ r
 -e test code
 -c 1
 }
-    test send-10.8 {SendEventProc procedure, exceptional return} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-r $id 62\n-s break\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {
+test send-10.8 {SendEventProc procedure, exceptional return} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-r $id 62\n-s break\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {
 r
 -s 62
 -r 
 -c 3
 }
-    test send-10.9 {SendEventProc procedure, empty return} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-r $id 62\n-s concat\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {
+test send-10.9 {SendEventProc procedure, empty return} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-r $id 62\n-s concat\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {
 r
 -s 62
 -r 
 }
-    test send-10.10 {SendEventProc procedure, asynchronous calls} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-s foreach i {1 2 3} {error {test error} {Initial errorInfo} {test code}}\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {}
-    test send-10.11 {SendEventProc procedure, exceptional return} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-s break\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {}
-    test send-10.12 {SendEventProc procedure, empty return} {
-	testsend prop [winfo id .f] Comm {}
-	testsend prop comm Comm \
-		"c\n-n tktest\n-s concat\n"
-	update
-	testsend prop [winfo id .f] Comm
-    } {}
-    test send-10.13 {SendEventProc procedure, return processing} {
-	testsend prop comm Comm \
-		"r\n-c 1\n-e test1\n-i test2\n-r test3\n-s [testsend serial]\n"
-	list [catch {send dummy foo} msg] $msg $errorInfo $errorCode
-    } {1 test3 {test2
+test send-10.10 {SendEventProc procedure, asynchronous calls} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-s foreach i {1 2 3} {error {test error} {Initial errorInfo} {test code}}\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {}
+test send-10.11 {SendEventProc procedure, exceptional return} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-s break\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {}
+test send-10.12 {SendEventProc procedure, empty return} {unixOnly testsend} {
+    testsend prop [winfo id .f] Comm {}
+    testsend prop comm Comm \
+	    "c\n-n tktest\n-s concat\n"
+    update
+    testsend prop [winfo id .f] Comm
+} {}
+test send-10.13 {SendEventProc procedure, return processing} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "r\n-c 1\n-e test1\n-i test2\n-r test3\n-s [testsend serial]\n"
+    list [catch {send dummy foo} msg] $msg $errorInfo $errorCode
+} {1 test3 {test2
     invoked from within
 "send dummy foo"} test1}
-    test send-10.14 {SendEventProc procedure, extraneous return options} {
-	testsend prop comm Comm \
-		"r\n-x test1\n-y test2\n-r result\n-s [testsend serial]\n"
-	list [catch {send dummy foo} msg] $msg
-    } {0 result}
-    test send-10.15 {SendEventProc procedure, serial number} {
-	testsend prop comm Comm \
-		"r\n-r response\n"
-	list [catch {send dummy foo} msg] $msg
-    } {1 {target application died or uses a Tk version before 4.0}}
-    test send-10.16 {SendEventProc procedure, serial number} {
-	testsend prop comm Comm \
-		"r\n-r response\n\n-s 0"
-	list [catch {send dummy foo} msg] $msg
-    } {1 {target application died or uses a Tk version before 4.0}}
-    test send-10.17 {SendEventProc procedure, errorCode and errorInfo} {
-	testsend prop comm Comm \
-		"r\n-i test1\n-e test2\n-c 4\n-s [testsend serial]\n"
-	set errorCode oldErrorCode
-	set errorInfo oldErrorInfo
-	list [catch {send dummy foo} msg] $msg $errorInfo $errorCode
-    } {4 {} oldErrorInfo oldErrorCode}
-    test send-10.18 {SendEventProc procedure, send kills application} {
-	setupbg
-	dobg {tk appname t_s_3}
-	set x [list [catch {send t_s_3 destroy .} msg] $msg]
-	cleanupbg
-	set x
-    } {0 {}}
-    test send-10.19 {SendEventProc procedure, send exits} {
-	setupbg
-	dobg {tk appname t_s_3}
-	set x [list [catch {send t_s_3 exit} msg] $msg]
-	close $::tcltest::fd
-	set x
-    } {1 {target application died}}
-
-    test send-11.1 {AppendPropCarefully and AppendErrorProc procedures} {
-	testsend prop root InterpRegistry "0x21447 dummy\n"
-	list [catch {send dummy foo} msg] $msg
-    } {1 {no application named "dummy"}}
-    test send-11.2 {AppendPropCarefully and AppendErrorProc procedures} {
-	testsend prop comm Comm "c\n-r0x123 44\n-n tktest\n-s concat a b c\n"
-	update
-    } {}
-}
+test send-10.14 {SendEventProc procedure, extraneous return options} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "r\n-x test1\n-y test2\n-r result\n-s [testsend serial]\n"
+    list [catch {send dummy foo} msg] $msg
+} {0 result}
+test send-10.15 {SendEventProc procedure, serial number} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "r\n-r response\n"
+    list [catch {send dummy foo} msg] $msg
+} {1 {target application died or uses a Tk version before 4.0}}
+test send-10.16 {SendEventProc procedure, serial number} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "r\n-r response\n\n-s 0"
+    list [catch {send dummy foo} msg] $msg
+} {1 {target application died or uses a Tk version before 4.0}}
+test send-10.17 {SendEventProc procedure, errorCode and errorInfo} {unixOnly testsend} {
+    testsend prop comm Comm \
+	    "r\n-i test1\n-e test2\n-c 4\n-s [testsend serial]\n"
+    set errorCode oldErrorCode
+    set errorInfo oldErrorInfo
+    list [catch {send dummy foo} msg] $msg $errorInfo $errorCode
+} {4 {} oldErrorInfo oldErrorCode}
+test send-10.18 {SendEventProc procedure, send kills application} {unixOnly testsend} {
+    setupbg
+    dobg {tk appname t_s_3}
+    set x [list [catch {send t_s_3 destroy .} msg] $msg]
+    cleanupbg
+    set x
+} {0 {}}
+test send-10.19 {SendEventProc procedure, send exits} {unixOnly testsend} {
+    setupbg
+    dobg {tk appname t_s_3}
+    set x [list [catch {send t_s_3 exit} msg] $msg]
+    close $::tcltest::fd
+    set x
+} {1 {target application died}}
+
+test send-11.1 {AppendPropCarefully and AppendErrorProc procedures} {unixOnly testsend} {
+    testsend prop root InterpRegistry "0x21447 dummy\n"
+    list [catch {send dummy foo} msg] $msg
+} {1 {no application named "dummy"}}
+test send-11.2 {AppendPropCarefully and AppendErrorProc procedures} {unixOnly testsend} {
+    testsend prop comm Comm "c\n-r0x123 44\n-n tktest\n-s concat a b c\n"
+    update
+} {}
 
 winfo interps
 tk appname tktest
 catch {destroy .f}
 frame .f
 set id [string range [winfo id .f] 2 end]
-if $gotTestCmds {
-    test send-12.1 {TimeoutProc procedure} {
-        testsend prop root InterpRegistry "$id dummy\n"
-        list [catch {send dummy foo} msg] $msg
-    } {1 {target application died or uses a Tk version before 4.0}}
-    testsend prop root InterpRegistry ""
-}
-test send-12.2 {TimeoutProc procedure} {
+
+test send-12.1 {TimeoutProc procedure} {unixOnly testsend} {
+    testsend prop root InterpRegistry "$id dummy\n"
+    list [catch {send dummy foo} msg] $msg
+} {1 {target application died or uses a Tk version before 4.0}}
+
+catch {testsend prop root InterpRegistry ""}
+
+test send-12.2 {TimeoutProc procedure} {unixOnly} {
     winfo interps
     tk appname tktest
     update
@@ -599,14 +588,14 @@ test send-12.2 {TimeoutProc procedure} {
 
 winfo interps
 tk appname tktest
-test send-13.1 {DeleteProc procedure} {
+test send-13.1 {DeleteProc procedure} {unixOnly} {
     setupbg
     set app [dobg {rename send {}; tk appname}]
     set result [list [catch {send $app foo} msg] $msg [winfo interps]]
     cleanupbg
     set result
 } {1 {no application named "tktest #2"} tktest}
-test send-13.2 {DeleteProc procedure} {
+test send-13.2 {DeleteProc procedure} {unixOnly} {
     winfo interps
     tk appname tktest
     rename send {}
@@ -616,7 +605,7 @@ test send-13.2 {DeleteProc procedure} {
     lappend result [winfo interps] [info commands send]
 } {{} {} foo send}
 
-test send-14.1 {SendRestrictProc procedure, sends crossing from different displays} {altDisplay} {
+test send-14.1 {SendRestrictProc procedure, sends crossing from different displays} {unixOnly altDisplay} {
     setupbg -display $env(TK_ALT_DISPLAY)
     set result [dobg "
     toplevel .t -screen [winfo screen .]
@@ -635,28 +624,26 @@ test send-14.1 {SendRestrictProc procedure, sends crossing from different displa
     set result
 } {child parent}
 
-if $gotTestCmds {
+catch {
     testsend prop root InterpRegister $registry
     tk appname tktest
-    test send-15.1 {UpdateCommWindow procedure} {
-	set x [list [testsend prop comm TK_APPLICATION]]
-	newApp "" t_s_1 Test
-	send t_s_1 wm withdraw .
-	newApp "" t_s_2 Test
-	send t_s_2 wm withdraw .
-	lappend x [testsend prop comm TK_APPLICATION]
-	interp delete t_s_1
-	lappend x [testsend prop comm TK_APPLICATION]
-	interp delete t_s_2
-	lappend x [testsend prop comm TK_APPLICATION]
-    } {tktest {t_s_2 t_s_1 tktest} {t_s_2 tktest} tktest}
 }
+test send-15.1 {UpdateCommWindow procedure} {unixOnly testsend} {
+    set x [list [testsend prop comm TK_APPLICATION]]
+    newApp "" t_s_1 Test
+    send t_s_1 wm withdraw .
+    newApp "" t_s_2 Test
+    send t_s_2 wm withdraw .
+    lappend x [testsend prop comm TK_APPLICATION]
+    interp delete t_s_1
+    lappend x [testsend prop comm TK_APPLICATION]
+    interp delete t_s_2
+    lappend x [testsend prop comm TK_APPLICATION]
+} {tktest {t_s_2 t_s_1 tktest} {t_s_2 tktest} tktest}
 
-tk appname $name
-if $gotTestCmds {
+catch {
+    tk appname $name
     testsend prop root InterpRegistry $registry
-}
-if $gotTestCmds {
     testdeleteapps
 }
 rename newApp {}
@@ -664,16 +651,3 @@ rename newApp {}
 # cleanup
 ::tcltest::cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-
-