From 55bf2282fef89f9be2acee9c55edaf116170ec00 Mon Sep 17 00:00:00 2001
From: hershey <hershey>
Date: Wed, 24 Mar 1999 01:16:26 +0000
Subject: - changed ::test to ::tcltest - made many tests more atomic (still
 more work to do here) - defs.tcl is now identicle for tcl and tk

---
 tests/README            |  239 +----------
 tests/all.tcl           |   49 ++-
 tests/arc.tcl           |   14 +-
 tests/bell.test         |   18 +-
 tests/bevel.tcl         |   14 +-
 tests/bgerror.test      |   18 +-
 tests/bind.test         |   18 +-
 tests/bitmap.test       |   20 +-
 tests/border.test       |   18 +-
 tests/bugs.tcl          |   14 +-
 tests/butGeom.tcl       |   14 +-
 tests/butGeom2.tcl      |   14 +-
 tests/button.test       |   18 +-
 tests/canvImg.test      |   18 +-
 tests/canvPs.test       |   18 +-
 tests/canvPsArc.tcl     |   14 +-
 tests/canvPsBmap.tcl    |   14 +-
 tests/canvPsGrph.tcl    |   14 +-
 tests/canvPsText.tcl    |   14 +-
 tests/canvRect.test     |   18 +-
 tests/canvText.test     |   18 +-
 tests/canvWind.test     |   18 +-
 tests/canvas.test       |   18 +-
 tests/clipboard.test    |   18 +-
 tests/clrpick.test      |   87 +++--
 tests/cmap.tcl          |   14 +-
 tests/cmds.test         |   18 +-
 tests/color.test        |   18 +-
 tests/config.test       |   18 +-
 tests/cursor.test       |   18 +-
 tests/defs.tcl          | 1000 ++++++++++++++++++++++++-----------------------
 tests/entry.test        |   32 +-
 tests/event.test        |   18 +-
 tests/filebox.test      |   25 +-
 tests/focus.test        |  193 +++++----
 tests/focusTcl.test     |   18 +-
 tests/font.test         |   20 +-
 tests/frame.test        |   18 +-
 tests/geometry.test     |   18 +-
 tests/get.test          |   18 +-
 tests/grid.test         |   18 +-
 tests/id.test           |   18 +-
 tests/image.test        |   18 +-
 tests/imgBmap.test      |   18 +-
 tests/imgPPM.test       |   18 +-
 tests/imgPhoto.test     |   24 +-
 tests/listbox.test      |   18 +-
 tests/macEmbed.test     |   65 +--
 tests/macFont.test      |   22 +-
 tests/macMenu.test      |   18 +-
 tests/macWinMenu.test   |   27 +-
 tests/macscrollbar.test |   18 +-
 tests/main.test         |   20 +-
 tests/menu.test         |   40 +-
 tests/menuDraw.test     |   34 +-
 tests/menubut.test      |   20 +-
 tests/msgbox.test       |   23 +-
 tests/obj.test          |   18 +-
 tests/oldpack.test      |   18 +-
 tests/option.test       |   30 +-
 tests/pack.test         |   18 +-
 tests/place.test        |   18 +-
 tests/raise.test        |   18 +-
 tests/safe.test         |   18 +-
 tests/scale.test        |   18 +-
 tests/scrollbar.test    |   22 +-
 tests/select.test       |   36 +-
 tests/send.test         |   26 +-
 tests/text.test         |   18 +-
 tests/textBTree.test    |   18 +-
 tests/textDisp.test     |   20 +-
 tests/textImage.test    |   20 +-
 tests/textIndex.test    |   18 +-
 tests/textMark.test     |   18 +-
 tests/textTag.test      |   18 +-
 tests/textWind.test     |   18 +-
 tests/tk.test           |   18 +-
 tests/unixButton.test   |   18 +-
 tests/unixEmbed.test    |   18 +-
 tests/unixFont.test     |   18 +-
 tests/unixMenu.test     |   18 +-
 tests/unixSend.test     |   26 +-
 tests/unixWm.test       |   24 +-
 tests/util.test         |   18 +-
 tests/visual.test       |   18 +-
 tests/winButton.test    |   41 +-
 tests/winClipboard.test |   31 +-
 tests/winDialog.test    |  107 ++---
 tests/winFont.test      |   83 ++--
 tests/winMenu.test      |  334 ++++++++--------
 tests/winSend.test      |    6 +-
 tests/winWm.test        |   46 ++-
 tests/window.test       |   17 +-
 tests/winfo.test        |   17 +-
 tests/xmfbox.test       |   39 +-
 95 files changed, 2371 insertions(+), 1516 deletions(-)

diff --git a/tests/README b/tests/README
index 4f75cdb..948405d 100644
--- a/tests/README
+++ b/tests/README
@@ -1,238 +1,7 @@
 README -- Tk test suite design document.
 
-RCS: @(#) $Id: README,v 1.1.4.2 1999/03/11 18:50:35 hershey Exp $
+RCS: @(#) $Id: README,v 1.1.4.3 1999/03/24 01:16:26 hershey Exp $
 
-
-Introduction:
--------------
-
-This directory contains a set of validation tests for the Tk
-commands.  Each of the files whose name ends in ".test" is
-intended to fully exercise one or a few Tk commands.  The
-commands tested by a given file are listed in the first line
-of the file.
-
-You can run the tests in three ways:
-
-    (a) type "make test" in ../unix; this will run all of the tests.
-
-    (b) type "tktest <testFile> ?<option> <value>?
-
-    (c) start up tktest in this directory, then "source" the test
-        file (for example, type "source parse.test").  To run all
-	of the tests, type "source all.tcl".
-
-In all cases, no output will be generated if all goes well, except for
-a listing of the tests..  If there are errors then additional messages
-will appear in the format described below.  Note that some tests will
-be skipped if you run as superuser.
-
-This approach to testing was designed and initially implemented
-by Mary Ann May-Pumphrey of Sun Microsystems.  Many thanks to
-her for donating her work back to the public Tcl release.
-
-The rest of this file provides additional information on the
-features of the testing environment.
-
-
-Definitions file:
------------------
-
-The file "defs.tcl" defines the "test" namespace which contains a
-collection of procedures and variables used to run the tests.  It is
-read in automatically by each of the .test files if needed, but once
-it has been read once it will not be read again by the .test files.
-Currently, the following procedures are exported from the "test"
-namespace and automatically imported:
-
-    cleanupTests dotests saveState restoreState normalizeMsg
-    makeFile removeFile makeDirectory removeDirectory viewFile
-    safeFetch bytestring set_iso8859_1_locale restore_locale
-    setTmpDir setupbg dobg bgReady cleanupbg fixfocus
-
-Please refer to the defs.tcl file for these procedures' specs.
-
-To keep tests from polluting the current working directory with
-unwanted files, you can specify a temporary directory, which will
-become the current working directory for the tests, by specifying
--tmpdir on the command line or by calling the ::test::setTmpDir
-procedure (after sourcing the defs.tcl file).  The default working dir
-is the directory from which tktest was called.  Please note that when
-you run the test suite by calling "make test", the working dir is
-<tk8.1>/tests.
-
-
-Test output:
-------------
-
-Foreach test file, the number of tests passed, skipped, and failed is
-printed to stdout.  Aside from this statistical information, output
-can be controlled on a per-test basis by the ::test::verbose variable.
-
-::test::verbose can be set to any substring or permutation of "bps".
-The default value of ::test::verbose is "b".  If 'b' is present, then
-the entire test is printed for each failed test, otherwise only the
-test's name, desired output, and actual output, are printed for each
-failed test.  If 'p' is present, then a line is printed for each
-passed test, otherwise no line is printed for passed tests.  If 's' is
-present, then a line (containing the consraints taht cause the test to
-be skipped) is printed for each skipped test, otherwise no line is
-printed for skipped tests.
-
-You can set ::test::verbose either interactively (after the defs.tcl
-file has been sourced) or by the command line argument -verbose, for
-example:
-
-      tktest select.test -verbose "psb"
-
-
-Selecting files to be sourced by all.tcl:
------------------------------------------
-
-You can specify the files you want all.tcl to source on the command
-line with the -file options.  For example, if you call the
-following:
-
-     tktest all.tcl -file canv*.test
-
-all files in <tk8.1>/tests that match the pattern canv*.test will be
-sourced by the all.tcl file.  Another useful example is if a
-particular test hangs, say "grid.test", and you just want to run the
-remaining tests, then you can call the following:
-
-     tktest all.tcl -file [h-z]*.test
-
-Note that the argument to -file will be substituted relative to the
-directory containing this file.
-
-
-Selecting tests for execution within a file:
---------------------------------------------
-
-Normally, all the tests in a file are run whenever the file is
-sourced.  Each test will be skipped if it doesn't match (using glob
-sytle matching) any element in the ::test::matchingTests variable, if
-it matches (using glob sytle matching) an element in
-::test::skippingTests, or if one of the elements of "constraints"
-turns out not to be true.
-
-You can set ::test::matchingTests and/or ::test::skippingTests either
-interactively (after the defs.tcl file has been sourced), or by the
-command line arguments -match and -skip, for example:
-
-       tktest select.test -match "*2.* *4.*" -skip "*2.33*"
-
-The three constraints: notIfCompiled, knownBug, and nonPortable can be
-overridden either interactively (after the defs.tcl file has been
-sourced) by setting the ::test::testConfig(<constraint>) variable, or
-by using the -constraints command line option with the name of the
-constraint in the argument.  The following example shows how to run
-tests that are constrained by the knownBug and nonPortable
-restricions:
-
-	tktest all.tcl -constraints "knownBug nonPortable"
-
-See the defs.tcl file for information about each of these constraints.
-Other constraints can be added at any time.  See the "Writing a new
-test" section below for more details about using built-in constraints
-and adding new ones.
-
-Adding a New Test File:
------------------------
-
-If the file matches the tests/*.test pattern (as it should), then it
-will automatically be run by the all.tcl file.  Make sure your test
-file can be run from any working dir.  Running the following should
-work the same from any cwd:
-
-	tktest <Tk8.1>/tests/all.tcl
-
-Make sure no temporary files are left behind by your test file.  Your
-test file should call "::test::cleanupTests" before returning.  The
-::test::cleanupTests procedure prints statistics about the number of
-tests that passed, skipped, and failed, and removes all files the were
-created using the ::test::makeFile and ::test::makeDirectory
-procedures.
-
-Be sure your tests can run cross-platform in both the build
-environment as well as the installation environment.  If your test
-file contains tests that should not be run in or more of those cases,
-please use the constraints mechanism described in the next section to
-skip those tests.
-
-
-Writing a new test:
--------------------
-
-The following is the spec for the "test" command:
-
-	test <name> <description> ?<constraint>? <script> <answer>
-
-The <name> field should be:
-
-	<target>-<majorNum>.<minorNum>
-
-For white-box (regression) tests, the target should be the name of the
-c function or Tk procedure being tested.  For black-box tests, the
-target should be the name of the feature being tested.  Related tests
-should share a major number.
-
-If your test requires that a file be created on the fly, please use
-the ::test::makeFile procedure.  If your test requires that a small
-file (<50 lines) be checked in, please consider creating the file on
-the fly using the ::test::makeFile procedure.  Files created by the
-::test::makeFile procedure will automatically be removed by the
-::test::cleanupTests call at the end of each test file.
-
-Add appropriate constraints (e.g., unixOnly) to any tests that should
-not always be run.  For example, a test that should only be run on
-Unix should look like the following:
-
-    test getAttribute-1.1 {testing file permissions} {unixOnly} {
-        lindex [file attributes foo.tcl] 5
-    } {00644}
-
-See the defs.tcl file for a list of built-in flags.  You can add any
-constraints that you need.  The following is how the defs.tcl file
-adds the "unixOnly" constraint:
-
-    set ::test::testConfig(unixOnly) [expr {$tcl_platform(platform) == "unix"}]
-
-
-Saving keystrokes:
-------------------
-
-A convenience procedure named "::test::dotests" is included in file
-"defs.tcl".  It takes two arguments--the name of the test file (such
-as "parse.test"), and a pattern selecting the tests you want to
-execute.  It sets ::test::matching to the second argument, calls
-"source" on the file specified in the first argument, and restores
-::test::matching to its pre-call value at the end.
-
-
-Incompatibilities with prior Tk versions:
-------------------------------------------
-
-1) Global variables such as VERBOSE, TESTS, and testConfig are now
-   renamed to use the new "test" namespace.
-
-   old name   new name
-   --------   --------
-   VERBOSE    ::test::verbose
-   TESTS      ::test::matchingTests
-   testConfig ::test::testConfig
-
-   The introduction of the "test" namespace is a precursor to using a
-   "test" package.  This next step will be part of a future Tk
-   version.
-
-2) VERBOSE values are no longer numeric.  Please see the section above
-   on "Test output" for the new usage of the ::test::verbose variable.
-
-3) When you run "make test", the working dir for the test suite is now
-   the one from which you called "make test", rather than the
-   <tk8.1>/tests directory.  This change allows for both unix and
-   windows test suites to be run simultaneously without interference.
-   All tests must now run independently of their working directory.
-   You can also control the working directory from the tktest command
-   line with the -tmpdir option.
+This directory contains a set of validation tests for the Tk commands.
+Please see the tests/README file in the Tcl source distribution for
+information about the test suite.
diff --git a/tests/all.tcl b/tests/all.tcl
index ae90c01..cb34556 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -7,39 +7,36 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: all.tcl,v 1.1.2.3 1999/03/14 01:22:52 hershey Exp $
+# RCS: @(#) $Id: all.tcl,v 1.1.2.4 1999/03/24 01:16:26 hershey Exp $
 
-if {[lsearch ::test [namespace children]] == -1} {
+if {[lsearch ::tcltest [namespace children]] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
-set ::test::testSingleFile false
+set ::tcltest::testSingleFile false
 
-puts stdout "Tk 8.1 tests running in interp:  [info nameofexecutable]"
-puts stdout "Tests running in working dir:  $::test::tmpDir"
-if {[llength $::test::skippingTests] > 0} {
-    puts stdout "Skipping tests that match:  $::test::skippingTests"
+puts stdout "Tk $tk_patchLevel tests running in interp:  [info nameofexecutable]"
+puts stdout "Tests running in working dir:  $::tcltest::tmpDir"
+if {[llength $::tcltest::skippingTests] > 0} {
+    puts stdout "Skipping tests that match:  $::tcltest::skippingTests"
 }
-if {[llength $::test::matchingTests] > 0} {
-    puts stdout "Only running tests that match:  $::test::matchingTests"
+if {[llength $::tcltest::matchingTests] > 0} {
+    puts stdout "Only running tests that match:  $::tcltest::matchingTests"
 }
 
 # Use command line specified glob pattern (specified by -file or -f)
-# if one exists.  Otherwise use *.test (or *.tes on win32s).  If given,
-# the file pattern should be specified relative to the dir containing
-# this file.  If no files are found to match the pattern, print an
-# error message and exit.
+# if one exists.  Otherwise use *.test.  If given, the file pattern
+# should be specified relative to the dir containing this file.  If no
+# files are found to match the pattern, print an error message and exit.
 set fileIndex [expr {[lsearch $argv "-file"] + 1}]
 set fIndex [expr {[lsearch $argv "-f"] + 1}]
 if {($fileIndex < 1) || ($fIndex > $fileIndex)} {
     set fileIndex $fIndex
 }
 if {$fileIndex > 0} {
-    set globPattern [file join $::test::testsDir [lindex $argv $fileIndex]]
+    set globPattern [file join $::tcltest::testsDir [lindex $argv $fileIndex]]
     puts stdout "Sourcing files that match:  $globPattern"
-} elseif {$tcl_platform(os) == "Win32s"} {
-    set globPattern [file join $::test::testsDir *.tes]
 } else {
-    set globPattern [file join $::test::testsDir *.test]
+    set globPattern [file join $::tcltest::testsDir *.test]
 }
 set fileList [glob -nocomplain $globPattern]
 if {[llength $fileList] < 1} {
@@ -64,7 +61,17 @@ foreach file [lsort $fileList] {
 
 # cleanup
 puts stdout "\nTests ended at [eval $timeCmd]"
-::test::cleanupTests 1
-#catch {destroy .}
-exit
-#return
+::tcltest::cleanupTests 1
+return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/arc.tcl b/tests/arc.tcl
index 0ed570d..13d1898 100644
--- a/tests/arc.tcl
+++ b/tests/arc.tcl
@@ -1,7 +1,7 @@
 # This file creates a visual test for arcs.  It is part of the Tk
 # visual test suite, which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: arc.tcl,v 1.1.4.1 1998/09/30 02:18:22 stanton Exp $
+# RCS: @(#) $Id: arc.tcl,v 1.1.4.2 1999/03/24 01:16:27 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -138,3 +138,15 @@ bind .t.c a {
 bind .t.c b {set go 0}
 
 bind .t.c <Control-x> {.t.c delete current}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bell.test b/tests/bell.test
index 9fc3ede..5ec8d48 100644
--- a/tests/bell.test
+++ b/tests/bell.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: bell.test,v 1.1.4.2 1999/03/11 18:50:36 hershey Exp $
+# RCS: @(#) $Id: bell.test,v 1.1.4.3 1999/03/24 01:16:28 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -32,5 +32,17 @@ test bell-1.4 {bell command} {
 } {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bevel.tcl b/tests/bevel.tcl
index 2123927..12b8338 100644
--- a/tests/bevel.tcl
+++ b/tests/bevel.tcl
@@ -2,7 +2,7 @@
 # widgets.  It is part of the Tk visual test suite, which is invoked
 # via the "visual" script.
 #
-# RCS: @(#) $Id: bevel.tcl,v 1.1.4.1 1998/09/30 02:18:23 stanton Exp $
+# RCS: @(#) $Id: bevel.tcl,v 1.1.4.2 1999/03/24 01:16:28 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -126,3 +126,15 @@ foreach i {1 2 3} {
 .t.t insert end rrr r1
 .t.t insert end *****
 .t.t insert end rrr r1
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bgerror.test b/tests/bgerror.test
index dff98f5..b92ac31 100644
--- a/tests/bgerror.test
+++ b/tests/bgerror.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: bgerror.test,v 1.1.4.2 1999/03/11 18:50:36 hershey Exp $
+# RCS: @(#) $Id: bgerror.test,v 1.1.4.3 1999/03/24 01:16:29 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -56,5 +56,17 @@ catch {rename tkerror {}}
 # to emulate.
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bind.test b/tests/bind.test
index 48e39d5..bef25a0 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: bind.test,v 1.1.4.4 1999/03/11 18:50:37 hershey Exp $
+# RCS: @(#) $Id: bind.test,v 1.1.4.5 1999/03/24 01:16:29 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -2569,5 +2569,17 @@ test bind-31.2 {MouseWheel events} {
 destroy .b
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bitmap.test b/tests/bitmap.test
index af4e542..d5a5a37 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: bitmap.test,v 1.1.2.3 1999/03/11 18:50:37 hershey Exp $
+# RCS: @(#) $Id: bitmap.test,v 1.1.2.4 1999/03/24 01:16:30 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -48,7 +48,7 @@ test bitmap-1.3 {Tk_AllocBitmapFromObj - reuse existing bitmap} {
     button .b2 -bitmap $x
     pack .b1 .b2 -side top
     lappend result [testbitmap gray25]
-} {{1 1}} {{2 1}}
+} {{{1 1}} {{2 1}}}
 
 test bitmap-2.1 {Tk_GetBitmap procedure} {
     destroy .b1
@@ -98,5 +98,17 @@ test bitmap-4.1 {FreeBitmapObjProc} {
 destroy .t
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/border.test b/tests/border.test
index a299392..70ff45f 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: border.test,v 1.1.2.3 1999/03/11 18:50:38 hershey Exp $
+# RCS: @(#) $Id: border.test,v 1.1.2.4 1999/03/24 01:16:30 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -175,5 +175,17 @@ test get-2.4 {Tk_GetReliefFromObj - error} {
 destroy .t
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/bugs.tcl b/tests/bugs.tcl
index 78a8c12..e7dbc2c 100644
--- a/tests/bugs.tcl
+++ b/tests/bugs.tcl
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: bugs.tcl,v 1.1.4.1 1998/09/30 02:18:25 stanton Exp $
+# RCS: @(#) $Id: bugs.tcl,v 1.1.4.2 1999/03/24 01:16:31 hershey Exp $
 
 if {[info procs test] != "test"} {
     source defs
@@ -28,3 +28,15 @@ test crash-1.1 {color} {
     . configure -bg rgb:345
     set foo ""
 } {}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/butGeom.tcl b/tests/butGeom.tcl
index 17b0598..d12e9a5 100644
--- a/tests/butGeom.tcl
+++ b/tests/butGeom.tcl
@@ -1,7 +1,7 @@
 # This file creates a visual test for button layout.  It is part of
 # the Tk visual test suite, which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: butGeom.tcl,v 1.1.4.1 1998/09/30 02:18:26 stanton Exp $
+# RCS: @(#) $Id: butGeom.tcl,v 1.1.4.2 1999/03/24 01:16:31 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -113,3 +113,15 @@ proc config {option value} {
 	$w configure $option $value
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/butGeom2.tcl b/tests/butGeom2.tcl
index 23af827..469037a 100644
--- a/tests/butGeom2.tcl
+++ b/tests/butGeom2.tcl
@@ -1,7 +1,7 @@
 # This file creates a visual test for button layout.  It is part of
 # the Tk visual test suite, which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: butGeom2.tcl,v 1.1.4.1 1998/09/30 02:18:26 stanton Exp $
+# RCS: @(#) $Id: butGeom2.tcl,v 1.1.4.2 1999/03/24 01:16:32 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -111,3 +111,15 @@ proc config-but {option value} {
 	$w configure $option $value
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/button.test b/tests/button.test
index 24d6111..99fe81a 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: button.test,v 1.1.4.3 1999/03/11 18:50:38 hershey Exp $
+# RCS: @(#) $Id: button.test,v 1.1.4.4 1999/03/24 01:16:32 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\""
@@ -16,7 +16,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -780,5 +780,17 @@ eval destroy [winfo children .]
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvImg.test b/tests/canvImg.test
index 61cffc0..812619f 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvImg.test,v 1.1.4.2 1999/03/11 18:50:39 hershey Exp $
+# RCS: @(#) $Id: canvImg.test,v 1.1.4.3 1999/03/24 01:16:33 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
@@ -16,7 +16,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -396,5 +396,17 @@ test canvImg-11.3 {ImageChangedProc procedure} {
 } {{foo2 display 0 0 20 40 50 40}}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvPs.test b/tests/canvPs.test
index a4da7f7..a872c61 100644
--- a/tests/canvPs.test
+++ b/tests/canvPs.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvPs.test,v 1.1.4.2 1999/03/11 18:50:40 hershey Exp $
+# RCS: @(#) $Id: canvPs.test,v 1.1.4.3 1999/03/24 01:16:34 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -100,5 +100,17 @@ removeFile bar.ps
 foreach i [winfo children .] {
     destroy $i
 }
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvPsArc.tcl b/tests/canvPsArc.tcl
index 81c12be..1b2e180 100644
--- a/tests/canvPsArc.tcl
+++ b/tests/canvPsArc.tcl
@@ -2,7 +2,7 @@
 # for bitmaps in canvases.  It is part of the Tk visual test suite,
 # which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsArc.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $
+# RCS: @(#) $Id: canvPsArc.tcl,v 1.1.4.2 1999/03/24 01:16:34 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -43,3 +43,15 @@ $c create arc .5i 4.5i 2i 6i -style arc -start 135 -extent 315 -width 3m \
     -outline black -outlinestipple gray25
 $c create arc 3.5i 4.5i 5.5i 5.5i -style arc -start 45 -extent -90 -width 1m \
     -outline black
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvPsBmap.tcl b/tests/canvPsBmap.tcl
index 9222713..ead8683 100644
--- a/tests/canvPsBmap.tcl
+++ b/tests/canvPsBmap.tcl
@@ -2,7 +2,7 @@
 # for bitmaps in canvases.  It is part of the Tk visual test suite,
 # which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsBmap.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $
+# RCS: @(#) $Id: canvPsBmap.tcl,v 1.1.4.2 1999/03/24 01:16:35 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -69,3 +69,15 @@ $c create bitmap 5.5i 5.5i \
     -bitmap @[file join $tk_library demos/images/flagup.bmp] \
     -background {} -foreground black -anchor se
 $c create rect 5.47i 5.47i 5.53i 5.53i -fill {} -outline black
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvPsGrph.tcl b/tests/canvPsGrph.tcl
index eb58c7e..d9aff81 100644
--- a/tests/canvPsGrph.tcl
+++ b/tests/canvPsGrph.tcl
@@ -2,7 +2,7 @@
 # for some of the graphical objects in canvases.  It is part of the Tk
 # visual test suite, which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsGrph.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $
+# RCS: @(#) $Id: canvPsGrph.tcl,v 1.1.4.2 1999/03/24 01:16:36 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -85,3 +85,15 @@ proc mkObjs c {
 }
 
 mkObjs $c
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvPsText.tcl b/tests/canvPsText.tcl
index 4364bb1..c4117df 100644
--- a/tests/canvPsText.tcl
+++ b/tests/canvPsText.tcl
@@ -2,7 +2,7 @@
 # for text in canvases.  It is part of the Tk visual test suite,
 # which is invoked via the "visual" script.
 #
-# RCS: @(#) $Id: canvPsText.tcl,v 1.1.4.1 1998/09/30 02:18:29 stanton Exp $
+# RCS: @(#) $Id: canvPsText.tcl,v 1.1.4.2 1999/03/24 01:16:36 hershey Exp $
 
 catch {destroy .t}
 toplevel .t
@@ -81,3 +81,15 @@ proc setStipple c {
     global stipple
     $c itemconfigure text -stipple $stipple
 }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvRect.test b/tests/canvRect.test
index 5a2a34f..79adc89 100644
--- a/tests/canvRect.test
+++ b/tests/canvRect.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvRect.test,v 1.1.4.2 1999/03/11 18:50:40 hershey Exp $
+# RCS: @(#) $Id: canvRect.test,v 1.1.4.3 1999/03/24 01:16:37 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -328,5 +328,17 @@ end
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvText.test b/tests/canvText.test
index 38de088..751b1f0 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvText.test,v 1.1.4.4 1999/03/11 18:50:41 hershey Exp $
+# RCS: @(#) $Id: canvText.test,v 1.1.4.5 1999/03/24 01:16:37 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -491,5 +491,17 @@ end
 %%EOF
 "
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvWind.test b/tests/canvWind.test
index 0038dac..c625606 100644
--- a/tests/canvWind.test
+++ b/tests/canvWind.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvWind.test,v 1.1.4.3 1999/03/11 18:50:41 hershey Exp $
+# RCS: @(#) $Id: canvWind.test,v 1.1.4.4 1999/03/24 01:16:38 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -133,5 +133,17 @@ test canvWind-1.4 {DisplayWinItem, windows off-screen horizontally} {
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/canvas.test b/tests/canvas.test
index 7eb96c6..ad4860e 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: canvas.test,v 1.1.4.4 1999/03/11 18:50:42 hershey Exp $
+# RCS: @(#) $Id: canvas.test,v 1.1.4.5 1999/03/24 01:16:38 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -245,5 +245,17 @@ test canvas-9.1 {canvas id creation and deletion} {
 } {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/clipboard.test b/tests/clipboard.test
index 08e3f1e..3223df9 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -6,14 +6,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: clipboard.test,v 1.1.4.2 1999/03/11 18:50:42 hershey Exp $
+# RCS: @(#) $Id: clipboard.test,v 1.1.4.3 1999/03/24 01:16:39 hershey Exp $
 
 #
 # Note: Multiple display clipboard handling will only be tested if the
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -233,5 +233,17 @@ test clipboard-7.14 {Tk_ClipboardCmd procedure} {
 } {1 {bad option "error": must be clear or append}}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/clrpick.test b/tests/clrpick.test
index 7f2ca75..c00727c 100644
--- a/tests/clrpick.test
+++ b/tests/clrpick.test
@@ -5,10 +5,10 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: clrpick.test,v 1.1.4.3 1999/03/11 18:50:43 hershey Exp $
+# RCS: @(#) $Id: clrpick.test,v 1.1.4.4 1999/03/24 01:16:39 hershey Exp $
 #
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -50,16 +50,10 @@ test clrpick-1.7 {tk_chooseColor command} {
 
 if {[info commands tkColorDialog] == ""} {
     set isNative 1
+    set ::tcltest::testConfig(tkDialog) 0
 } else {
     set isNative 0
-}
-
-if {$isNative && ![info exists INTERACTIVE]} {
-    puts " Some tests were skipped because they could not be performed"
-    puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
-    return
+    set ::tcltest::testConfig(tkDialog) 1
 }
 
 proc ToPressButton {parent btn} {
@@ -140,8 +134,9 @@ set verylongstring $verylongstring$verylongstring
 
 # let's soak up a bunch of colors...so that
 # machines with small color palettes still fail.
+# some tests will be skipped if there are no more colors
 set numcolors 32
-set nomorecolors 0
+set ::tcltest::testConfig(colorsLeftover) 1
 set i 0
 canvas .c
 pack .c -expand 1 -fill both
@@ -159,7 +154,7 @@ while {$i<$numcolors} {
 	set g [expr $g/256]
 	set b [expr $b/256]
 	if {"$color" != "#[format %02x%02x%02x $r $g $b]"} {
-	    set nomorecolors 1
+	    set ::tcltest::testConfig(colorsLeftover) 0
 	}
     }
     .c delete $i
@@ -168,51 +163,61 @@ while {$i<$numcolors} {
 
 destroy .c
 
-if {!$nomorecolors} {
-    set color #404040
-    test clrpick-2.1 {tk_chooseColor command} {
-	ToPressButton $parent ok
-	tk_chooseColor -title "Press Ok $verylongstring" -initialcolor $color -parent $parent
-    } "$color"
+set color #404040
+test clrpick-2.1 {tk_chooseColor command} \
+	{interactive colorsLeftover tkDialog} {
+    ToPressButton $parent ok
+    tk_chooseColor -title "Press Ok $verylongstring" -initialcolor $color \
+	    -parent $parent
+} "$color"
     
-    set color #808040
-    test clrpick-2.2 {tk_chooseColor command} {
-	if {$tcl_platform(platform) == "macintosh"} {
-	    set colors "32768 32768 16384"
-	} else {
-	    set colors "128 128 64"
-	}
-	ToChooseColorByKey $parent 128 128 64
-	tk_chooseColor -parent $parent -title "choose $colors"
-    } "$color"
+set color #808040
+test clrpick-2.2 {tk_chooseColor command} \
+	{interactive colorsLeftover tkDialog} {
+    if {$tcl_platform(platform) == "macintosh"} {
+	set colors "32768 32768 16384"
+    } else {
+	set colors "128 128 64"
+    }
+    ToChooseColorByKey $parent 128 128 64
+    tk_chooseColor -parent $parent -title "choose $colors"
+} "$color"
     
-    test clrpick-2.3 {tk_chooseColor command} {
-	ToPressButton $parent ok
-	tk_chooseColor -parent $parent -title "Press OK"
-    } "$color"
-} else {
-    puts "Skipped tests clrpick2.1, clrpick2.2 and clrpick2.3 because"
-    puts "you ran out of colors in your color palette, and this would"
-    puts "have caused the tests to generate errors."
-}
+test clrpick-2.3 {tk_chooseColor command} \
+	{interactive colorsLeftover tkDialog} {
+    ToPressButton $parent ok
+    tk_chooseColor -parent $parent -title "Press OK"
+} "$color"
     
-test clrpick-2.4 {tk_chooseColor command} {
+test clrpick-2.4 {tk_chooseColor command} {interactive tkDialog} {
     ToPressButton $parent cancel
     tk_chooseColor -parent $parent -title "Press Cancel"
 } ""
 
 set color #000000
-test clrpick-3.1 {tk_chooseColor: background events} {
+test clrpick-3.1 {tk_chooseColor: background events} {interactive tkDialog} {
     after 1 {set x 53}
     ToPressButton $parent ok
     tk_chooseColor -parent $parent -title "Press OK" -initialcolor $color
 } "#000000"
-test clrpick-3.2 {tk_chooseColor: background events} {
+test clrpick-3.2 {tk_chooseColor: background events} {interactive tkDialog} {
     after 1 {set x 53}
     ToPressButton $parent cancel
     tk_chooseColor -parent $parent -title "Press Cancel"
 } ""
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cmap.tcl b/tests/cmap.tcl
index f69986a..5f81893 100644
--- a/tests/cmap.tcl
+++ b/tests/cmap.tcl
@@ -2,7 +2,7 @@
 # property.  It is part of the Tk visual test suite, which is invoked
 # via the "visual" script.
 #
-# RCS: @(#) $Id: cmap.tcl,v 1.1.4.1 1998/09/30 02:18:32 stanton Exp $
+# RCS: @(#) $Id: cmap.tcl,v 1.1.4.2 1999/03/24 01:16:40 hershey Exp $
 
 catch {destroy .t}
 toplevel .t -colormap new
@@ -59,3 +59,15 @@ pack .t2.quit -side bottom -pady 3 -ipadx 4 -ipady 2
 frame .t2.f -height 320 -width 320
 pack .t2.f -side bottom
 colors .t2.f 0 0 4
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cmds.test b/tests/cmds.test
index 8c5e932..147a0b5 100644
--- a/tests/cmds.test
+++ b/tests/cmds.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: cmds.test,v 1.1.4.2 1999/03/11 18:50:43 hershey Exp $
+# RCS: @(#) $Id: cmds.test,v 1.1.4.3 1999/03/24 01:16:40 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -42,5 +42,17 @@ test cmds-1.5 {tkwait visibility, window gets deleted} {
 } {1 {window ".f.b" was deleted before its visibility changed} deleted}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/color.test b/tests/color.test
index 876632d..a47d573 100644
--- a/tests/color.test
+++ b/tests/color.test
@@ -5,14 +5,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: color.test,v 1.1.4.3 1999/03/11 18:50:44 hershey Exp $
+# RCS: @(#) $Id: color.test,v 1.1.4.4 1999/03/24 01:16:41 hershey Exp $
 
 if {[info commands testcolor] != "testcolor"} {
     puts "testcolor command not available; skipping tests"
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -277,5 +277,17 @@ test color-4.1 {FreeColorObjProc} {
 destroy .t
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/config.test b/tests/config.test
index 724f0e3..323a411 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: config.test,v 1.1.2.3 1999/03/11 18:50:45 hershey Exp $
+# RCS: @(#) $Id: config.test,v 1.1.2.4 1999/03/24 01:16:41 hershey Exp $
 
 if {[info command testobjconfig] != "testobjconfig"} {
     puts "This application hasn't been compiled with the \"testobjconfig\""
@@ -15,7 +15,7 @@ if {[info command testobjconfig] != "testobjconfig"} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -821,5 +821,17 @@ test config-12.16 {GetObjectForOption - null values} {
 # cleanup
 eval destroy [winfo children .]
 killTables
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/cursor.test b/tests/cursor.test
index 84c9f29..347e7b8 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: cursor.test,v 1.1.2.3 1999/03/11 18:50:45 hershey Exp $
+# RCS: @(#) $Id: cursor.test,v 1.1.2.4 1999/03/24 01:16:42 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -98,5 +98,17 @@ test cursor-4.1 {FreeCursorObjProc} {
 destroy .t
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/defs.tcl b/tests/defs.tcl
index a98e3f6..776d0bf 100644
--- a/tests/defs.tcl
+++ b/tests/defs.tcl
@@ -1,6 +1,6 @@
 # defs.tcl --
 #
-#	This file contains support code for the Tk test suite.It is
+#	This file contains support code for the Tcl/Tk test suite.It is
 #	It is normally sourced by the individual files in the test suite
 #	before they run their tests.  This improved approach to testing
 #	was designed and initially implemented by Mary Ann May-Pumphrey
@@ -11,21 +11,31 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: defs.tcl,v 1.1.2.2 1999/03/14 01:22:52 hershey Exp $
+# RCS: @(#) $Id: defs.tcl,v 1.1.2.3 1999/03/24 01:16:43 hershey Exp $
 
-tk appname tktest
-wm title . tktest
+# Initialize wish shell
+if {[info exists tk_version]} {
+    tk appname tktest
+    wm title . tktest
+} else {
+    # Ensure that we have a minimal auto_path so we don't pick up extra junk.
+    set auto_path [list [info library]]
+}
 
 # create the "test" namespace for all testing variables and procedures
-namespace eval test {
-    foreach proc [list test cleanupTests dotests saveState restoreState \
+namespace eval tcltest {
+    set procList [list test cleanupTests dotests saveState restoreState \
 	    normalizeMsg makeFile removeFile makeDirectory removeDirectory \
 	    viewFile safeFetch bytestring set_iso8859_1_locale restore_locale \
-	    setTmpDir setupbg dobg bgReady cleanupbg fixfocus] {
+	    setTmpDir]
+    if {[info exists tk_version]} {
+	lappend procList setupbg dobg bgReady cleanupbg fixfocus
+    }
+    foreach proc $procList {
 	namespace export $proc
     }
 
-    # ::test::verbose defaults to "b"
+    # ::tcltest::verbose defaults to "b"
     variable verbose "b"
 
     # matchingTests defaults to the empty list
@@ -36,7 +46,7 @@ namespace eval test {
 
     # Tests should not rely on the current working directory.
     # Files that are part of the test suite should be accessed relative to
-    # ::test::testsDir.
+    # ::tcltest::testsDir.
 
     set originalDir [pwd]
     set tDir [file join $originalDir [file dirname [info script]]]
@@ -57,17 +67,21 @@ namespace eval test {
     variable failFiles {}
 
     # Tests should remove all files they create.  The test suite will
-    # check tmpDir for files created by the tests.  ::test::filesMade
-    # keeps track of such files created using the test::makeFile and
-    # test::makeDirectory procedures.  ::test::filesExisted stores
+    # check tmpDir for files created by the tests.  ::tcltest::filesMade
+    # keeps track of such files created using the ::tcltest::makeFile and
+    # ::tcltest::makeDirectory procedures.  ::tcltest::filesExisted stores
     # the names of pre-existing files.
 
     variable filesMade {}
     variable filesExisted {}
 
-    # initialize ::test::numTests array to keep track fo the number of
+    # initialize ::tcltest::numTests array to keep track fo the number of
     # tests that pass, fial, and are skipped.
     array set numTests [list Total 0 Passed 0 Skipped 0 Failed 0]
+
+    # initialize ::tcltest::skippedBecause array to keep track of
+    # constraints that kept tests from running
+    array set ::tcltest::skippedBecause {}
 }
 
 # If there is no "memory" command (because memory debugging isn't
@@ -77,47 +91,264 @@ if {[info commands memory] == ""} {
     proc memory args {}
 }
 
-# ::test::setTmpDir --
+# ::tcltest::initConfig --
+#
+# Check configuration information that will determine which tests
+# to run.  To do this, create an array ::tcltest::testConfig.  Each
+# element has a 0 or 1 value.  If the element is "true" then tests
+# with that constraint will be run, otherwise tests with that constraint
+# will be skipped.  See the README file for the list of built-in
+# constraints defined in this procedure.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	The ::tcltest::testConfig array is reset to have an index for
+#	each built-in test constraint.
+
+proc ::tcltest::initConfig {} {
+
+    global tcl_platform tcl_interactive tk_version
+
+    catch {unset ::tcltest::testConfig}
+
+    # The following trace procedure makes it so that we can safely refer to
+    # non-existent members of the ::tcltest::testConfig array without causing an
+    # error.  Instead, reading a non-existent member will return 0.  This is
+    # necessary because tests are allowed to use constraint "X" without ensuring
+    # that ::tcltest::testConfig("X") is defined.
+
+    trace variable ::tcltest::testConfig r ::tcltest::safeFetch
+
+    proc ::tcltest::safeFetch {n1 n2 op} {
+	if {($n2 != {}) && ([info exists ::tcltest::testConfig($n2)] == 0)} {
+	    set ::tcltest::testConfig($n2) 0
+	}
+    }
+
+    set ::tcltest::testConfig(unixOnly) \
+	    [expr {$tcl_platform(platform) == "unix"}]
+    set ::tcltest::testConfig(macOnly) \
+	    [expr {$tcl_platform(platform) == "macintosh"}]
+    set ::tcltest::testConfig(pcOnly) \
+	    [expr {$tcl_platform(platform) == "windows"}]
+
+    set ::tcltest::testConfig(unix) $::tcltest::testConfig(unixOnly)
+    set ::tcltest::testConfig(mac) $::tcltest::testConfig(macOnly)
+    set ::tcltest::testConfig(pc) $::tcltest::testConfig(pcOnly)
+
+    set ::tcltest::testConfig(unixOrPc) \
+	    [expr {$::tcltest::testConfig(unix) || $::tcltest::testConfig(pc)}]
+    set ::tcltest::testConfig(macOrPc) \
+	    [expr {$::tcltest::testConfig(mac) || $::tcltest::testConfig(pc)}]
+    set ::tcltest::testConfig(macOrUnix) \
+	    [expr {$::tcltest::testConfig(mac) || $::tcltest::testConfig(unix)}]
+
+    set ::tcltest::testConfig(nt) [expr {$tcl_platform(os) == "Windows NT"}]
+    set ::tcltest::testConfig(95) [expr {$tcl_platform(os) == "Windows 95"}]
+
+    # The following config switches are used to mark tests that should work,
+    # but have been temporarily disabled on certain platforms because they don't
+    # and we haven't gotten around to fixing the underlying problem.
+
+    set ::tcltest::testConfig(tempNotPc) [expr {!$::tcltest::testConfig(pc)}]
+    set ::tcltest::testConfig(tempNotMac) [expr {!$::tcltest::testConfig(mac)}]
+    set ::tcltest::testConfig(tempNotUnix) [expr {!$::tcltest::testConfig(unix)}]
+
+    # The following config switches are used to mark tests that crash on
+    # certain platforms, so that they can be reactivated again when the
+    # underlying problem is fixed.
+
+    set ::tcltest::testConfig(pcCrash) [expr {!$::tcltest::testConfig(pc)}]
+    set ::tcltest::testConfig(macCrash) [expr {!$::tcltest::testConfig(mac)}]
+    set ::tcltest::testConfig(unixCrash) [expr {!$::tcltest::testConfig(unix)}]
+
+    # Set the "fonts" constraint for wish apps
+    if {[info exists tk_version]} {
+	set ::tcltest::testConfig(fonts) 1
+	catch {destroy .e}
+	entry .e -width 0 -font {Helvetica -12} -bd 1
+	.e insert end "a.bcd"
+	if {([winfo reqwidth .e] != 37) || ([winfo reqheight .e] != 20)} {
+	    set ::tcltest::testConfig(fonts) 0
+	}
+	destroy .e
+	catch {destroy .t}
+	text .t -width 80 -height 20 -font {Times -14} -bd 1
+	pack .t
+	.t insert end "This is\na dot."
+	update
+	set x [list [.t bbox 1.3] [.t bbox 2.5]]
+	destroy .t
+	if {[string match {{22 3 6 15} {31 18 [34] 15}} $x] == 0} {
+	    set ::tcltest::testConfig(fonts) 0
+	}
+    }
+
+    # By default, non-portable tests are skipped.
+    set ::tcltest::testConfig(nonPortable) 0
+
+    # By default, tests that expost known bugs are skipped.
+    set ::tcltest::testConfig(knownBug) 0
+
+    # Some tests must be skipped if the interpreter is not in interactive mode
+    set ::tcltest::testConfig(interactive) $tcl_interactive
+
+    # Some tests must be skipped if you are running as root on Unix.
+    # Other tests can only be run if you are running as root on Unix.
+    set ::tcltest::testConfig(root) 0
+    set ::tcltest::testConfig(notRoot) 1
+    set user {}
+    if {$tcl_platform(platform) == "unix"} {
+	catch {set user [exec whoami]}
+	if {$user == ""} {
+	    catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
+	}
+	if {($user == "root") || ($user == "")} {
+	    set ::tcltest::testConfig(root) 1
+	    set ::tcltest::testConfig(notRoot) 0
+	}
+    }
+
+    # Set nonBlockFiles constraint: 1 means this platform supports
+    # setting files into nonblocking mode.
+    if {[catch {set f [open defs r]}]} {
+	set ::tcltest::testConfig(nonBlockFiles) 1
+    } else {
+	if {[catch {fconfigure $f -blocking off}] == 0} {
+	    set ::tcltest::testConfig(nonBlockFiles) 1
+	} else {
+	    set ::tcltest::testConfig(nonBlockFiles) 0
+	}
+	close $f
+    }
+
+    # Set asyncPipeClose constraint: 1 means this platform supports
+    # async flush and async close on a pipe.
+    #
+    # Test for SCO Unix - cannot run async flushing tests because a
+    # potential problem with select is apparently interfering.
+    # (Mark Diekhans).
+    if {$tcl_platform(platform) == "unix"} {
+	if {[catch {exec uname -X | fgrep {Release = 3.2v}}] == 0} {
+	    set ::tcltest::testConfig(asyncPipeClose) 0
+	} else {
+	    set ::tcltest::testConfig(asyncPipeClose) 1
+	}
+    } else {
+	set ::tcltest::testConfig(asyncPipeClose) 1
+    }
+
+    # Test to see if we have a broken version of sprintf with respect
+    # to the "e" format of floating-point numbers.
+    set ::tcltest::testConfig(eformat) 1
+    if {[string compare "[format %g 5e-5]" "5e-05"] != 0} {
+	set ::tcltest::testConfig(eformat) 0
+    }
+
+    # Test to see if execed commands such as cat, echo, rm and so forth are
+    # present on this machine.
+    set ::tcltest::testConfig(unixExecs) 1
+    if {$tcl_platform(platform) == "macintosh"} {
+	set ::tcltest::testConfig(unixExecs) 0
+    }
+    if {($::tcltest::testConfig(unixExecs) == 1) && \
+	    ($tcl_platform(platform) == "windows")} {
+	if {[catch {exec cat defs}] == 1} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec echo hello}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec sh -c echo hello}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec wc defs}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {$::tcltest::testConfig(unixExecs) == 1} {
+	    exec echo hello > removeMe
+	    if {[catch {exec rm removeMe}] == 1} {
+		set ::tcltest::testConfig(unixExecs) 0
+	    }
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec sleep 1}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec fgrep unixExecs defs}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec ps}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec echo abc > removeMe}] == 0) && \
+		([catch {exec chmod 644 removeMe}] == 1) && \
+		([catch {exec rm removeMe}] == 0)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	} else {
+	    catch {exec rm -f removeMe}
+	}
+	if {($::tcltest::testConfig(unixExecs) == 1) && \
+		([catch {exec mkdir removeMe}] == 1)} {
+	    set ::tcltest::testConfig(unixExecs) 0
+	} else {
+	    catch {exec rm -r removeMe}
+	}
+    }
+}
+
+::tcltest::initConfig
+
+
+# ::tcltest::setTmpDir --
 #
-#	Set the ::test::tmpDir to the specified value.  If the path
+#	Set the ::tcltest::tmpDir to the specified value.  If the path
 #	is relative, make it absolute.  If the file exists but is not
 #	a dir, then return an error.  If the dir does not already
 #	exist, create it.  If you cannot create it, then return an error.
 #
 # Arguments:
-#	value	the new value of ::test::tmpDir
+#	value	the new value of ::tcltest::tmpDir
 #
 # Results:
-#	::test::tmpDir is set to <value> and created if it didn't already
-#	exist.  The working dir is changed to ::test::tmpDir.
+#	::tcltest::tmpDir is set to <value> and created if it didn't already
+#	exist.  The working dir is changed to ::tcltest::tmpDir.
 
-proc ::test::setTmpDir {value} {
+proc ::tcltest::setTmpDir {value} {
 
-    set ::test::tmpDir $value
+    set ::tcltest::tmpDir $value
 
-    if {[string compare [file pathtype $::test::tmpDir] absolute] != 0} {
-	set ::test::tmpDir [file join [pwd] $::test::tmpDir]
+    if {[string compare [file pathtype $::tcltest::tmpDir] absolute] != 0} {
+	set ::tcltest::tmpDir [file join [pwd] $::tcltest::tmpDir]
     }
-    if {[file exists $::test::tmpDir]} {
-	if {![file isdir $::test::tmpDir]} {
+    if {[file exists $::tcltest::tmpDir]} {
+	if {![file isdir $::tcltest::tmpDir]} {
 	    puts stderr "Error:  bad argument \"$value\" to -tmpdir:"
-	    puts stderr "            \"$::test::tmpDir\""
+	    puts stderr "            \"$::tcltest::tmpDir\""
 	    puts stderr "        is not a directory"
 	    exit
 	}
     } else {
-	file mkdir $::test::tmpDir
+	file mkdir $::tcltest::tmpDir
     }
 
     # change the working dir to tmpDir and add the existing files in
     # tmpDir to the filesExisted list.
-    cd $::test::tmpDir
+    cd $::tcltest::tmpDir
     foreach file [glob -nocomplain [file join [pwd] *]] {
-	lappend ::test::filesExisted $file
+	lappend ::tcltest::filesExisted $file
     }
 }
 
-# ::test::processCmdLineArgs --
+# ::tcltest::processCmdLineArgs --
 #
 #	Use command line args to set the tmpDir, verbose, skippingTests, and
 #	matchingTests variables.
@@ -126,9 +357,9 @@ proc ::test::setTmpDir {value} {
 #	none
 #
 # Results:
-#	::test::verbose is set to <value>
+#	::tcltest::verbose is set to <value>
 
-proc ::test::processCmdLineArgs {} {
+proc ::tcltest::processCmdLineArgs {} {
     global argv
 
     # The "argv" var doesn't exist in some cases, so use {}
@@ -146,289 +377,61 @@ proc ::test::processCmdLineArgs {} {
     }
     
     # Allow for 1-char abbreviations, where applicable (e.g., -tmpdir == -t).
-    # Note that -verbose cannot be abbreviated to -v because it conflicts
+    # Note that -verbose cannot be abbreviated to -v in wish because it conflicts
     # with the wish option -visual.
-    foreach arg {-match -skip -constraints -tmpdir} {
+    foreach arg {-verbose -match -skip -constraints -tmpdir} {
 	set abbrev [string range $arg 0 1]
 	if {([info exists flag($abbrev)]) && \
-		([lsearch $flagArray $arg] < [lsearch $flagArray $abbrev])} {
+		([lsearch -exact $flagArray $arg] < \
+		[lsearch -exact $flagArray $abbrev])} {
 	    set flag($arg) $flag($abbrev)
 	}
     }
 
-    # Set ::test::tmpDir to the arg of the -tmpdir flag, if given.
-    # ::test::tmpDir defaults to [pwd].
-    # Save the names of files that already exist in ::test::tmpDir.
+    # Set ::tcltest::tmpDir to the arg of the -tmpdir flag, if given.
+    # ::tcltest::tmpDir defaults to [pwd].
+    # Save the names of files that already exist in ::tcltest::tmpDir.
     if {[info exists flag(-tmpdir)]} {
-	::test::setTmpDir $flag(-tmpdir)
+	::tcltest::setTmpDir $flag(-tmpdir)
     } else {
-	set ::test::tmpDir [pwd]
+	set ::tcltest::tmpDir [pwd]
     }
-    foreach file [glob -nocomplain [file join $::test::tmpDir *]] {
-	lappend ::test::filesExisted [file tail $file]
+    foreach file [glob -nocomplain [file join $::tcltest::tmpDir *]] {
+	lappend ::tcltest::filesExisted [file tail $file]
     }
 
-    # Set ::test::verbose to the arg of the -verbose flag, if given
+    # Set ::tcltest::verbose to the arg of the -verbose flag, if given
     if {[info exists flag(-verbose)]} {
-	set ::test::verbose $flag(-verbose)
+	set ::tcltest::verbose $flag(-verbose)
     }
 
-    # Set ::test::matchingTests to the arg of the -match flag, if given
+    # Set ::tcltest::matchingTests to the arg of the -match flag, if given
     if {[info exists flag(-match)]} {
-	set ::test::matchingTests $flag(-match)
+	set ::tcltest::matchingTests $flag(-match)
     }
 
-    # Set ::test::skippingTests to the arg of the -skip flag, if given
+    # Set ::tcltest::skippingTests to the arg of the -skip flag, if given
     if {[info exists flag(-skip)]} {
-	set ::test::skippingTests $flag(-skip)
+	set ::tcltest::skippingTests $flag(-skip)
     }
 
-    # Use the -constraints flag, if given, so turn on the following
-    # constraints:  notIfCompiled, knownBug, nonPortable
+    # Use the -constraints flag, if given, to turn on the following
+    # constraints:  knownBug and nonPortable
     if {[info exists flag(-constraints)]} {
 	set constrList $flag(-constraints)
     } else {
 	set constrList {}
     }
-    foreach elt [list notIfCompiled knownBug nonPortable] {
-	set ::test::testConfig($elt) [expr {[lsearch $constrList $elt] != -1}]
-    }
-    if {$::test::testConfig(nonPortable) == 0} {
-	puts "(will skip non-portable tests)"
-    }
-}
-test::processCmdLineArgs
-
-# Check configuration information that will determine which tests
-# to run.  To do this, create an array ::test::testConfig.  Each element
-# has a 0 or 1 value, and the following elements are defined:
-#	unixOnly -	1 means this is a UNIX platform, so it's OK
-#			to run tests that only work under UNIX.
-#	macOnly -	1 means this is a Mac platform, so it's OK
-#			to run tests that only work on Macs.
-#	pcOnly -	1 means this is a PC platform, so it's OK to
-#			run tests that only work on PCs.
-#	unixOrPc -	1 means this is a UNIX or PC platform.
-#	macOrPc -	1 means this is a Mac or PC platform.
-#	macOrUnix -	1 means this is a Mac or UNIX platform.
-#	notIfCompiled -	1 means this that it is safe to run tests that
-#                       might fail if the bytecode compiler is used. This
-#                       element is set to 1 if the -allComp flag was used.
-#                       Normally, this element is 0 so that tests that
-#                       fail with the bytecode compiler are skipped.
-#			As of 11/2/96 these are the history tests since
-#			they depend on accurate source location information.
-#			You can run these tests by using the -constraint
-#			command line option with "knownBug" in the argument
-#			list.
-#       knownBug -      The test is known to fail and the bug is not yet
-#                       fixed. The test will be run only if the flag
-#                       -allBuggy is used (intended for Tcl dev. group
-#                       internal use only).  You can run these tests by
-#			using the -constraint command line option with
-#			"knownBug" in the argument list.
-#	nonPortable -	1 means this the tests are being running in
-#			the master Tcl/Tk development environment;
-#			Some tests are inherently non-portable because
-#			they depend on things like word length, file system
-#			configuration, window manager, etc.  These tests
-#			are only run in the main Tcl development directory
-#			where the configuration is well known.  You can
-#			run these tests by using the -constraint command
-#			line option with "nonPortable" in the argument list.
-#	tempNotPc -	The inverse of pcOnly.  This flag is used to
-#			temporarily disable a test.
-#	tempNotMac -	The inverse of macOnly.  This flag is used to
-#			temporarily disable a test.
-#	nonBlockFiles - 1 means this platform supports setting files into
-#			nonblocking mode.
-#	asyncPipeClose- 1 means this platform supports async flush and
-#			async close on a pipe.
-#	unixExecs     - 1 means this machine has commands such as 'cat',
-#			'echo' etc available.
-#       hasIsoLocale  - 1 means the tests that need to switch to an iso
-#                       locale can be run.
-#
-
-catch {unset ::test::testConfig}
-
-# The following trace procedure makes it so that we can safely refer to
-# non-existent members of the ::test::testConfig array without causing an
-# error.  Instead, reading a non-existent member will return 0.  This is
-# necessary because tests are allowed to use constraint "X" without ensuring
-# that ::test::testConfig("X") is defined.
-
-trace variable ::test::testConfig r ::test::safeFetch
-
-proc ::test::safeFetch {n1 n2 op} {
-    if {($n2 != {}) && ([info exists ::test::testConfig($n2)] == 0)} {
-	set ::test::testConfig($n2) 0
-    }
-}
-
-set ::test::testConfig(unixOnly) 	[expr {$tcl_platform(platform) == "unix"}]
-set ::test::testConfig(macOnly) 	[expr {$tcl_platform(platform) == "macintosh"}]
-set ::test::testConfig(pcOnly)		[expr {$tcl_platform(platform) == "windows"}]
-
-set ::test::testConfig(unix)		$::test::testConfig(unixOnly)
-set ::test::testConfig(mac)		$::test::testConfig(macOnly)
-set ::test::testConfig(pc)		$::test::testConfig(pcOnly)
-
-set ::test::testConfig(unixOrPc)	[expr {$::test::testConfig(unix) || $::test::testConfig(pc)}]
-set ::test::testConfig(macOrPc)		[expr {$::test::testConfig(mac) || $::test::testConfig(pc)}]
-set ::test::testConfig(macOrUnix)	[expr {$::test::testConfig(mac) || $::test::testConfig(unix)}]
-
-set ::test::testConfig(nt)		[expr {$tcl_platform(os) == "Windows NT"}]
-set ::test::testConfig(95)		[expr {$tcl_platform(os) == "Windows 95"}]
-set ::test::testConfig(win32s)		[expr {$tcl_platform(os) == "Win32s"}]
-
-# The following config switches are used to mark tests that should work,
-# but have been temporarily disabled on certain platforms because they don't
-# and we haven't gotten around to fixing the underlying problem.
-
-set ::test::testConfig(tempNotPc) 	[expr {!$::test::testConfig(pc)}]
-set ::test::testConfig(tempNotMac) 	[expr {!$::test::testConfig(mac)}]
-set ::test::testConfig(tempNotUnix)	[expr {!$::test::testConfig(unix)}]
-
-# The following config switches are used to mark tests that crash on
-# certain platforms, so that they can be reactivated again when the
-# underlying problem is fixed.
-
-set ::test::testConfig(pcCrash) 	[expr {!$::test::testConfig(pc)}]
-set ::test::testConfig(macCrash) 	[expr {!$::test::testConfig(mac)}]
-set ::test::testConfig(unixCrash)	[expr {!$::test::testConfig(unix)}]
-
-if {[catch {set f [open defs r]}]} {
-    set ::test::testConfig(nonBlockFiles) 1
-} else {
-    if {[catch {fconfigure $f -blocking off}] == 0} {
-	set ::test::testConfig(nonBlockFiles) 1
-    } else {
-	set ::test::testConfig(nonBlockFiles) 0
+    foreach elt [list knownBug nonPortable] {
+	set ::tcltest::testConfig($elt) \
+		[expr {[lsearch -exact $constrList $elt] != -1}]
     }
-    close $f
 }
 
-# set the "fonts" constraint
+::tcltest::processCmdLineArgs
 
-set ::test::testConfig(fonts) 1
-catch {destroy .e}
-entry .e -width 0 -font {Helvetica -12} -bd 1
-.e insert end "a.bcd"
-if {([winfo reqwidth .e] != 37) || ([winfo reqheight .e] != 20)} {
-    set ::test::testConfig(fonts) 0
-}
-destroy .e
-catch {destroy .t}
-text .t -width 80 -height 20 -font {Times -14} -bd 1
-pack .t
-.t insert end "This is\na dot."
-update
-set x [list [.t bbox 1.3] [.t bbox 2.5]]
-destroy .t
-if {[string match {{22 3 6 15} {31 18 [34] 15}} $x] == 0} {
-    set ::test::testConfig(fonts) 0
-}
-if {$::test::testConfig(fonts) == 0} {
-    puts stdout "(will skip font-sensitive tests: this system has unexpected font geometries)"
-}
 
-# If tests are being run as root, issue a warning message and set a
-# variable to prevent some tests from running at all.
-
-set user {}
-if {$tcl_platform(platform) == "unix"} {
-    catch {set user [exec whoami]}
-    if {$user == ""} {
-        catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-    }
-    if {$user == ""} {set user root}
-    if {$user == "root"} {
-        puts stdout "Warning: you're executing as root.  I'll have to"
-        puts stdout "skip some of the tests, since they'll fail as root."
-	set ::test::testConfig(root) 1
-    }
-}
-
-# Test for SCO Unix - cannot run async flushing tests because a potential
-# problem with select is apparently interfering. (Mark Diekhans).
-
-if {$tcl_platform(platform) == "unix"} {
-    if {[catch {exec uname -X | fgrep {Release = 3.2v}}] == 0} {
-	set ::test::testConfig(asyncPipeClose) 0
-    } else {
-	set ::test::testConfig(asyncPipeClose) 1
-    }
-} else {
-    set ::test::testConfig(asyncPipeClose) 1
-}
-
-# Test to see if we have a broken version of sprintf with respect to the
-# "e" format of floating-point numbers.
-
-set ::test::testConfig(eformat) 1
-if {[string compare "[format %g 5e-5]" "5e-05"] != 0} {
-    set ::test::testConfig(eformat) 0
-    puts stdout "(will skip tests that depend on the \"e\" format of floating-point numbers)"
-}
-
-# Test to see if execed commands such as cat, echo, rm and so forth are
-# present on this machine.
-
-set ::test::testConfig(unixExecs) 1
-if {$tcl_platform(platform) == "macintosh"} {
-    set ::test::testConfig(unixExecs) 0
-}
-if {($::test::testConfig(unixExecs) == 1) && ($tcl_platform(platform) == "windows")} {
-    if {[catch {exec cat defs}] == 1} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && ([catch {exec echo hello}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && \
-		([catch {exec sh -c echo hello}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && ([catch {exec wc defs}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {$::test::testConfig(unixExecs) == 1} {
-	exec echo hello > removeMe
-        if {[catch {exec rm removeMe}] == 1} {
-	    set ::test::testConfig(unixExecs) 0
-	}
-    }
-    if {($::test::testConfig(unixExecs) == 1) && ([catch {exec sleep 1}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && \
-		([catch {exec fgrep unixExecs defs}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && ([catch {exec ps}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    }
-    if {($::test::testConfig(unixExecs) == 1) && \
-		([catch {exec echo abc > removeMe}] == 0) && \
-		([catch {exec chmod 644 removeMe}] == 1) && \
-		([catch {exec rm removeMe}] == 0)} {
-	set ::test::testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -f removeMe}
-    }
-    if {($::test::testConfig(unixExecs) == 1) && \
-		([catch {exec mkdir removeMe}] == 1)} {
-	set ::test::testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -r removeMe}
-    }
-    if {$::test::testConfig(unixExecs) == 0} {
-	puts "(will skip tests that depend on Unix-style executables)"
-    }
-}
-
-# ::test::cleanupTests --
+# ::tcltest::cleanupTests --
 #
 # Remove files and dirs created using the makeFile and makeDirectory
 # commands since the last time this proc was invoked.
@@ -440,42 +443,55 @@ if {($::test::testConfig(unixExecs) == 1) && ($tcl_platform(platform) == "window
 # tests were invoked.
 #
 
-proc ::test::cleanupTests {{all 0}} {
+proc ::tcltest::cleanupTests {{calledFromAllFile 0}} {
     # remove files and directories created by the tests
-    foreach file $::test::filesMade {
+    foreach file $::tcltest::filesMade {
 	if {[file exists $file]} {
 	    catch {file delete -force $file}
 	}
     }
 
     set tail [file tail [info script]]
-    if {$all || $::test::testSingleFile} {
+    if {$calledFromAllFile || $::tcltest::testSingleFile} {
 	# print stats
 	puts -nonewline stdout "$tail:"
 	foreach index [list "Total" "Passed" "Skipped" "Failed"] {
-	    puts -nonewline stdout "\t$index\t$::test::numTests($index)"
+	    puts -nonewline stdout "\t$index\t$::tcltest::numTests($index)"
 	}
 	puts stdout ""
 
 	# print number test files sourced
 	# print names of files that ran tests which failed
-	if {$all} {
-	    puts stdout "Sourced $::test::numTestFiles Test Files."
-	    set ::test::numTestFiles 0
-	    if {[llength $::test::failFiles] > 0} {
-		puts stdout "Files with failing tests: $::test::failFiles"
-		set ::test::failFiles {}
+	if {$calledFromAllFile} {
+	    puts stdout "Sourced $::tcltest::numTestFiles Test Files."
+	    set ::tcltest::numTestFiles 0
+	    if {[llength $::tcltest::failFiles] > 0} {
+		puts stdout "Files with failing tests: $::tcltest::failFiles"
+		set ::tcltest::failFiles {}
+	    }
+	}
+
+	# if any tests were skipped, print the constraints that kept them
+	# from running.
+	if {$::tcltest::numTests(Skipped) > 0} {
+	    puts stdout "Number of tests skipped for each constraint:"
+	    foreach constraint [lsort [array names ::tcltest::skippedBecause]] {
+		puts stdout \
+			"\t$::tcltest::skippedBecause($constraint)\t$constraint"
+		unset ::tcltest::skippedBecause($constraint)
 	    }
 	}
 
-	# report the names of files in ::test::tmpDir that were not pre-existing.
+	# report the names of files in ::tcltest::tmpDir that were not
+	# pre-existing.
+
 	set currentFiles {}
-	foreach file [glob -nocomplain [file join $::test::tmpDir *]] {
+	foreach file [glob -nocomplain [file join $::tcltest::tmpDir *]] {
 	    lappend currentFiles [file tail $file]
 	}
 	set filesNew {}
 	foreach file $currentFiles {
-	    if {[lsearch $::test::filesExisted $file] == -1} {
+	    if {[lsearch -exact $::tcltest::filesExisted $file] == -1} {
 		lappend filesNew $file
 	    }
 	}
@@ -484,21 +500,27 @@ proc ::test::cleanupTests {{all 0}} {
 	}
 
 	# reset filesMade, filesExisted, and numTests
-	set ::test::filesMade {}
-	set ::test::filesExisted $currentFiles
+	set ::tcltest::filesMade {}
+	set ::tcltest::filesExisted $currentFiles
 	foreach index [list "Total" "Passed" "Skipped" "Failed"] {
-	    set ::test::numTests($index) 0
+	    set ::tcltest::numTests($index) 0
+	}
+
+	# exit only if running Tk in non-interactive mode
+	global tk_version tcl_interactive
+	if {[info exists tk_version] && !$tcl_interactive} {
+	    exit
 	}
     } else {
 	# if we're deferring stat-reporting until all files are sourced,
 	# then add current file to failFile list if any tests in this file
 	# failed
-	incr ::test::numTestFiles
-	if {($::test::currentFailure) && \
-		([lsearch $::test::failFiles $tail] == -1)} {
-	    lappend ::test::failFiles $tail
+	incr ::tcltest::numTestFiles
+	if {($::tcltest::currentFailure) && \
+		([lsearch -exact $::tcltest::failFiles $tail] == -1)} {
+	    lappend ::tcltest::failFiles $tail
 	}
-	set ::test::currentFailure false
+	set ::tcltest::currentFailure false
     }
 }
 
@@ -506,10 +528,10 @@ proc ::test::cleanupTests {{all 0}} {
 # test --
 #
 # This procedure runs a test and prints an error message if the test fails.
-# If ::test::verbose has been set, it also prints a message even if the
+# If ::tcltest::verbose has been set, it also prints a message even if the
 # test succeeds.  The test will be skipped if it doesn't match the
-# ::test::matchingTests variable, if it matches an element in
-# ::test::skippingTests, or if one of the elements of "constraints" turns
+# ::tcltest::matchingTests variable, if it matches an element in
+# ::tcltest::skippingTests, or if one of the elements of "constraints" turns
 # out not to be true.
 #
 # Arguments:
@@ -518,7 +540,7 @@ proc ::test::cleanupTests {{all 0}} {
 #			help humans understand what it does.
 # constraints -		A list of one or more keywords, each of
 #			which must be the name of an element in
-#			the array "::test::testConfig".  If any of these
+#			the array "::tcltest::testConfig".  If any of these
 #			elements is zero, the test is skipped.
 #			This argument may be omitted.
 # script -		Script to run to carry out the test.  It must
@@ -526,27 +548,27 @@ proc ::test::cleanupTests {{all 0}} {
 #			correctness.
 # expectedAnswer -	Expected result from script.
 
-proc ::test::test {name description script expectedAnswer args} {
-    incr ::test::numTests(Total)
+proc ::tcltest::test {name description script expectedAnswer args} {
+    incr ::tcltest::numTests(Total)
 
     # skip the test if it's name matches an element of skippingTests
-    foreach pattern $::test::skippingTests {
+    foreach pattern $::tcltest::skippingTests {
 	if {[string match $pattern $name]} {
-	    incr ::test::numTests(Skipped)
+	    incr ::tcltest::numTests(Skipped)
 	    return
 	}
     }
     # skip the test if it's name doesn't match any element of matchingTests
-    if {[llength $::test::matchingTests] > 0} {
+    if {[llength $::tcltest::matchingTests] > 0} {
 	set ok 0
-	foreach pattern $::test::matchingTests {
+	foreach pattern $::tcltest::matchingTests {
 	    if {[string match $pattern $name]} {
 		set ok 1
 		break
 	    }
         }
 	if {!$ok} {
-	    incr ::test::numTests(Skipped)
+	    incr ::tcltest::numTests(Skipped)
 	    return
 	}
     }
@@ -567,27 +589,37 @@ proc ::test::test {name description script expectedAnswer args} {
 	    catch {set doTest [uplevel #0 expr $constraints]}
 	} elseif {[regexp {[^.a-zA-Z0-9 ]+} $constraints] != 0} {
 	    # something like {a || b} should be turned into 
-	    # $::test::testConfig(a) || $::test::testConfig(b).
+	    # $::tcltest::testConfig(a) || $::tcltest::testConfig(b).
 
- 	    regsub -all {[.a-zA-Z0-9]+} $constraints {$::test::testConfig(&)} c
+ 	    regsub -all {[.a-zA-Z0-9]+} $constraints \
+		    {$::tcltest::testConfig(&)} c
 	    catch {set doTest [eval expr $c]}
 	} else {
 	    # just simple constraints such as {unixOnly fonts}.
 
 	    set doTest 1
 	    foreach constraint $constraints {
-		if {![info exists ::test::testConfig($constraint)]
-			|| !$::test::testConfig($constraint)} {
+		if {![info exists ::tcltest::testConfig($constraint)]
+			|| !$::tcltest::testConfig($constraint)} {
 		    set doTest 0
+		    # store the constraint that kept the test from running
+		    set constraints $constraint
 		    break
 		}
 	    }
 	}
 	if {$doTest == 0} {
-	    incr ::test::numTests(Skipped)
-	    if {[string first s $::test::verbose] != -1} {
+	    incr ::tcltest::numTests(Skipped)
+	    if {[string first s $::tcltest::verbose] != -1} {
 		puts stdout "++++ $name SKIPPED: $constraints"
 	    }
+	    # add the constraint to the list of constraints the kept tests
+	    # from running
+	    if {[info exists ::tcltest::skippedBecause($constraints)]} {
+		incr ::tcltest::skippedBecause($constraints)
+	    } else {
+		set ::tcltest::skippedBecause($constraints) 1
+	    }
 	    return	
 	}
     } else {
@@ -596,9 +628,9 @@ proc ::test::test {name description script expectedAnswer args} {
     memory tag $name
     set code [catch {uplevel $script} actualAnswer]
     if {$code != 0 || [string compare $actualAnswer $expectedAnswer] != 0} {
-	incr ::test::numTests(Failed)
-	set ::test::currentFailure true
-	if {[string first b $::test::verbose] == -1} {
+	incr ::tcltest::numTests(Failed)
+	set ::tcltest::currentFailure true
+	if {[string first b $::tcltest::verbose] == -1} {
 	    set script ""
 	}
 	puts stdout "\n==== $name $description FAILED"
@@ -627,28 +659,28 @@ proc ::test::test {name description script expectedAnswer args} {
 	puts stdout "---- Result should have been:\n$expectedAnswer"
 	puts stdout "==== $name FAILED\n" 
     } else { 
-	incr ::test::numTests(Passed)
-	if {[string first p $::test::verbose] != -1} {
+	incr ::tcltest::numTests(Passed)
+	if {[string first p $::tcltest::verbose] != -1} {
 	    puts stdout "++++ $name PASSED"
 	}
     }
 }
 
-proc ::test::dotests {file args} {
-    set savedTests $::test::matchingTests
-    set ::test::matchingTests $args
+proc ::tcltest::dotests {file args} {
+    set savedTests $::tcltest::matchingTests
+    set ::tcltest::matchingTests $args
     source $file
-    set ::test::matchingTests $savedTests
+    set ::tcltest::matchingTests $savedTests
 }
 
-proc ::test::openfiles {} {
+proc ::tcltest::openfiles {} {
     if {[catch {testchannel open} result]} {
 	return {}
     }
     return $result
 }
 
-proc ::test::leakfiles {old} {
+proc ::tcltest::leakfiles {old} {
     if {[catch {testchannel open} new]} {
         return {}
     }
@@ -661,26 +693,26 @@ proc ::test::leakfiles {old} {
     return $leak
 }
 
-set ::test::saveState {}
+set ::tcltest::saveState {}
 
-proc ::test::saveState {} {
-    uplevel #0 {set ::test::saveState [list [info procs] [info vars]]}
+proc ::tcltest::saveState {} {
+    uplevel #0 {set ::tcltest::saveState [list [info procs] [info vars]]}
 }
 
-proc ::test::restoreState {} {
+proc ::tcltest::restoreState {} {
     foreach p [info procs] {
-	if {[lsearch [lindex $::test::saveState 0] $p] < 0} {
+	if {[lsearch [lindex $::tcltest::saveState 0] $p] < 0} {
 	    rename $p {}
 	}
     }
     foreach p [uplevel #0 {info vars}] {
-	if {[lsearch [lindex $::test::saveState 1] $p] < 0} {
+	if {[lsearch [lindex $::tcltest::saveState 1] $p] < 0} {
 	    uplevel #0 "unset $p"
 	}
     }
 }
 
-proc ::test::normalizeMsg {msg} {
+proc ::tcltest::normalizeMsg {msg} {
     regsub "\n$" [string tolower $msg] "" msg
     regsub -all "\n\n" $msg "\n" msg
     regsub -all "\n\}" $msg "\}" msg
@@ -695,7 +727,7 @@ proc ::test::normalizeMsg {msg} {
 # cleanupTests was called, add it to the $filesMade list, so it will
 # be removed by the next call to cleanupTests.
 #
-proc ::test::makeFile {contents name} {
+proc ::tcltest::makeFile {contents name} {
     set fd [open $name w]
     fconfigure $fd -translation lf
     if {[string index $contents [expr {[string length $contents] - 1}]] == "\n"} {
@@ -706,12 +738,12 @@ proc ::test::makeFile {contents name} {
     close $fd
 
     set fullName [file join [pwd] $name]
-    if {[lsearch $::test::filesMade $fullName] == -1} {
-	lappend ::test::filesMade $fullName
+    if {[lsearch -exact $::tcltest::filesMade $fullName] == -1} {
+	lappend ::tcltest::filesMade $fullName
     }
 }
 
-proc ::test::removeFile {name} {
+proc ::tcltest::removeFile {name} {
     file delete $name
 }
 
@@ -723,23 +755,23 @@ proc ::test::removeFile {name} {
 # cleanupTests was called, add it to the $directoriesMade list, so it will
 # be removed by the next call to cleanupTests.
 #
-proc ::test::makeDirectory {name} {
+proc ::tcltest::makeDirectory {name} {
     file mkdir $name
 
     set fullName [file join [pwd] $name]
-    if {[lsearch $::test::filesMade $fullName] == -1} {
-	lappend ::test::filesMade $fullName
+    if {[lsearch -exact $::tcltest::filesMade $fullName] == -1} {
+	lappend ::tcltest::filesMade $fullName
     }
 }
 
-proc ::test::removeDirectory {name} {
+proc ::tcltest::removeDirectory {name} {
     file delete -force $name
 }
 
-proc ::test::viewFile {name} {
+proc ::tcltest::viewFile {name} {
     global tcl_platform
     if {($tcl_platform(platform) == "macintosh") || \
-		($::test::testConfig(unixExecs) == 0)} {
+		($::tcltest::testConfig(unixExecs) == 0)} {
 	set f [open $name]
 	set data [read -nonewline $f]
 	close $f
@@ -763,53 +795,46 @@ proc ::test::viewFile {name} {
 # construct improperly formed strings in this manner, because it involves
 # exposing that Tcl uses UTF-8 internally.
 
-proc ::test::bytestring {string} {
+proc ::tcltest::bytestring {string} {
     encoding convertfrom identity $string
 }
 
 # Locate tcltest executable
 
-set tcltest [info nameofexecutable]
+if {![info exists tk_version]} {
+    set tcltest [info nameofexecutable]
 
-if {$tcltest == "{}"} {
-    set tcltest {}
-    puts stdout "Unable to find tcltest executable, multiple process tests will fail."
+    if {$tcltest == "{}"} {
+	set tcltest {}
+    }
 }
 
-set ::test::testConfig(stdio) 0
-if {$tcl_platform(os) != "Win32s"} {
-    # Don't even try running another copy of tcltest under win32s, or you 
-    # get an error dialog about multiple instances.
-
-    catch {
-	file delete -force tmp
-	set f [open tmp w]
-	puts $f {
-	    exit
-	}
-	close $f
-
-	# The following 2 lines are commented out due to a new pipe bug
-	# (bugID 1495) on windowns in Tk8.1b2
+set ::tcltest::testConfig(stdio) 0
+catch {
+    catch {file delete -force tmp}
+    set f [open tmp w]
+    puts $f {
+	exit
+    }
+    close $f
 
-	#set f [open "|[list $tcltest tmp]" r]
-	#close $f
+    # The following 2 lines cannot be run on Windows in Tk8.1b2
+    # This bug is logged as a pipe bug (bugID 1495).
 
-	set ::test::testConfig(stdio) 1
+    if {($tcl_platform(platform) != "windows") || \
+	    (![info exists tk_version])} {
+	set f [open "|[list $tcltest tmp]" r]
+	close $f
     }
-    catch {file delete -force tmp}
-}
-
-if {($tcl_platform(platform) == "windows") && ($::test::testConfig(stdio) == 0)} {
-    puts stdout "(will skip tests that redirect stdio of exec'd 32-bit applications)"
+    set ::tcltest::testConfig(stdio) 1
 }
+catch {file delete -force tmp}
 
+# Deliberately call the socket with the wrong number of arguments.  The error
+# message you get will indicate whether sockets are available on this system.
 catch {socket} msg
-set ::test::testConfig(socket) [expr {$msg != "sockets are not available on this system"}]
-
-if {$::test::testConfig(socket) == 0} {
-    puts stdout "(will skip tests that use sockets)"
-}
+set ::tcltest::testConfig(socket) \
+	[expr {$msg != "sockets are not available on this system"}]
 
 #
 # Internationalization / ISO support procs     -- dl
@@ -819,149 +844,156 @@ if {[info commands testlocale]==""} {
     # (it could be that we are a sub interp and we could just load
     # the Tcltest package but that would interfere with tests
     # that tests packages/loading in slaves...)
-    set ::test::testConfig(hasIsoLocale) 0
+    set ::tcltest::testConfig(hasIsoLocale) 0
 } else {
-    proc ::test::set_iso8859_1_locale {} {
-	set ::test::previousLocale [testlocale ctype]
-	testlocale ctype $::test::isoLocale
+    proc ::tcltest::set_iso8859_1_locale {} {
+	set ::tcltest::previousLocale [testlocale ctype]
+	testlocale ctype $::tcltest::isoLocale
     }
 
-    proc ::test::restore_locale {} {
-	testlocale ctype $::test::previousLocale
+    proc ::tcltest::restore_locale {} {
+	testlocale ctype $::tcltest::previousLocale
     }
 
-    if {![info exists ::test::isoLocale]} {
-	set ::test::isoLocale fr
+    if {![info exists ::tcltest::isoLocale]} {
+	set ::tcltest::isoLocale fr
         switch $tcl_platform(platform) {
 	    "unix" {
 		# Try some 'known' values for some platforms:
 		switch -exact -- $tcl_platform(os) {
 		    "FreeBSD" {
-			set ::test::isoLocale fr_FR.ISO_8859-1
+			set ::tcltest::isoLocale fr_FR.ISO_8859-1
 		    }
 		    HP-UX {
-			set ::test::isoLocale fr_FR.iso88591
+			set ::tcltest::isoLocale fr_FR.iso88591
 		    }
 		    Linux -
 		    IRIX {
-			set ::test::isoLocale fr
+			set ::tcltest::isoLocale fr
 		    }
 		    default {
 			# Works on SunOS 4 and Solaris, and maybe others...
 			# define it to something else on your system
 			#if you want to test those.
-			set ::test::isoLocale iso_8859_1
+			set ::tcltest::isoLocale iso_8859_1
 		    }
 		}
 	    }
 	    "windows" {
-		set ::test::isoLocale French
+		set ::tcltest::isoLocale French
 	    }
 	}
     }
 
-    set ::test::testConfig(hasIsoLocale) \
-	    [string length [::test::set_iso8859_1_locale]]
-    ::test::restore_locale
-
-    if {$::test::testConfig(hasIsoLocale) == 0} {
-	puts "(will skip tests that need to set an iso8859-1 locale)"
-    }
-
+    set ::tcltest::testConfig(hasIsoLocale) \
+	    [string length [::tcltest::set_iso8859_1_locale]]
+    ::tcltest::restore_locale
 } 
 
-# If the main window isn't already mapped (e.g. because the tests are
-# being run automatically) , specify a precise size for it so that the
-# user won't have to position it manually.
-
-if {![winfo ismapped .]} {
-    wm geometry . +0+0
-    update
-}
-
-# The following code can be used to perform tests involving a second
-# process running in the background.
-
-# Locate tktest executable
+#
+# procedures that are Tk specific
+#
+if {[info exists tk_version]} {
+    # If the main window isn't already mapped (e.g. because the tests are
+    # being run automatically) , specify a precise size for it so that the
+    # user won't have to position it manually.
 
-set ::test::tktest [info nameofexecutable]
-if {$::test::tktest == "{}"} {
-    set ::test::tktest {}
-    puts stdout "Unable to find tktest executable, skipping multiple process tests."
-}
+    if {![winfo ismapped .]} {
+	wm geometry . +0+0
+	update
+    }
 
-# Create background process
+    # The following code can be used to perform tests involving a second
+    # process running in the background.
+    
+    # Locate the tktest executable
 
-proc ::test::setupbg args {
-    if {$::test::tktest == ""} {
-        error "you're not running tktest so setupbg should not have been called"
+    set ::tcltest::tktest [info nameofexecutable]
+    if {$::tcltest::tktest == "{}"} {
+	set ::tcltest::tktest {}
+	puts stdout "Unable to find tktest executable, skipping multiple process tests."
     }
-    if {[info exists ::test::fd] && ($::test::fd != "")} {
-	cleanupbg
-    }
-    set ::test::fd [open "|[list $::test::tktest -geometry +0+0 -name tktest] $args" r+]
-    puts $::test::fd "puts foo; flush stdout"
-    flush $::test::fd
-    if {[gets $::test::fd data] < 0} {
-        error "unexpected EOF from \"$::test::tktest\""
+
+    # Create background process
+    
+    proc ::tcltest::setupbg args {
+	if {$::tcltest::tktest == ""} {
+	    error "you're not running tktest so setupbg should not have been called"
+	}
+	if {[info exists ::tcltest::fd] && ($::tcltest::fd != "")} {
+	    cleanupbg
+	}
+	
+	# The following code segment cannot be run on Windows in Tk8.1b2
+	# This bug is logged as a pipe bug (bugID 1495).
+
+	global tcl_platform
+	if {$tcl_platform(platform) != "windows"} {
+	    set ::tcltest::fd [open "|[list $::tcltest::tktest -geometry +0+0 -name tktest] $args" r+]
+	    puts $::tcltest::fd "puts foo; flush stdout"
+	    flush $::tcltest::fd
+	    if {[gets $::tcltest::fd data] < 0} {
+		error "unexpected EOF from \"$::tcltest::tktest\""
+	    }
+	    if {[string compare $data foo]} {
+		error "unexpected output from background process \"$data\""
+	    }
+	    fileevent $::tcltest::fd readable bgReady
+	}
     }
-    if {[string compare $data foo]} {
-        error "unexpected output from background process \"$data\""
+    
+    # Send a command to the background process, catching errors and
+    # flushing I/O channels
+    proc ::tcltest::dobg {command} {
+	puts $::tcltest::fd "catch [list $command] msg; update; puts \$msg; puts **DONE**; flush stdout"
+	flush $::tcltest::fd
+	set ::tcltest::bgDone 0
+	set ::tcltest::bgData {}
+	tkwait variable ::tcltest::bgDone
+	set ::tcltest::bgData
+    }
+
+    # Data arrived from background process.  Check for special marker
+    # indicating end of data for this command, and make data available
+    # to dobg procedure.
+    proc ::tcltest::bgReady {} {
+	set x [gets $::tcltest::fd]
+	if {[eof $::tcltest::fd]} {
+	    fileevent $::tcltest::fd readable {}
+	    set ::tcltest::bgDone 1
+	} elseif {$x == "**DONE**"} {
+	    set ::tcltest::bgDone 1
+	} else {
+	    append ::tcltest::bgData $x
+	}
     }
-    fileevent $::test::fd readable bgReady
-}
 
-# Send a command to the background process, catching errors and
-# flushing I/O channels
-proc ::test::dobg {command} {
-    puts $::test::fd "catch [list $command] msg; update; puts \$msg; puts **DONE**; flush stdout"
-    flush $::test::fd
-    set ::test::bgDone 0
-    set ::test::bgData {}
-    tkwait variable ::test::bgDone
-    set ::test::bgData
-}
-
-# Data arrived from background process.  Check for special marker
-# indicating end of data for this command, and make data available
-# to dobg procedure.
-proc ::test::bgReady {} {
-    set x [gets $::test::fd]
-    if {[eof $::test::fd]} {
-	fileevent $::test::fd readable {}
-	set ::test::bgDone 1
-    } elseif {$x == "**DONE**"} {
-	set ::test::bgDone 1
-    } else {
-	append ::test::bgData $x
+    # Exit the background process, and close the pipes
+    proc ::tcltest::cleanupbg {} {
+	catch {
+	    puts $::tcltest::fd "exit"
+	    close $::tcltest::fd
+	}
+	set ::tcltest::fd ""
     }
-}
 
-# Exit the background process, and close the pipes
-proc ::test::cleanupbg {} {
-    catch {
-	puts $::test::fd "exit"
-	close $::test::fd
+    # Clean up focus after using generate event, which
+    # can leave the window manager with the wrong impression
+    # about who thinks they have the focus. (BW)
+    
+    proc ::tcltest::fixfocus {} {
+	catch {destroy .focus}
+	toplevel .focus
+	wm geometry .focus +0+0
+	entry .focus.e
+	.focus.e insert 0 "fixfocus"
+	pack .focus.e
+	update
+	focus -force .focus.e
+	destroy .focus
     }
-    set ::test::fd ""
-}
-
-# Clean up focus after using generate event, which
-# can leave the window manager with the wrong impression
-# about who thinks they have the focus. (BW)
-
-proc ::test::fixfocus {} {
-    catch {destroy .focus}
-    toplevel .focus
-    wm geometry .focus +0+0
-    entry .focus.e
-    .focus.e insert 0 "fixfocus"
-    pack .focus.e
-    update
-    focus -force .focus.e
-    destroy .focus
 }
 
 # Need to catch the import because it fails if defs.tcl is sourced
 # more than once.
-catch {namespace import ::test::*}
+catch {namespace import ::tcltest::*}
diff --git a/tests/entry.test b/tests/entry.test
index 25a0ade..e4267de 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: entry.test,v 1.1.4.4 1999/03/11 18:50:47 hershey Exp $
+# RCS: @(#) $Id: entry.test,v 1.1.4.5 1999/03/24 01:16:43 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\""
@@ -15,7 +15,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -723,7 +723,7 @@ test entry-6.9 {EntryComputeGeometry procedure} {fonts} {
     update
     list [winfo reqwidth .e] [winfo reqheight .e]
 } {25 39}
-test entry-6.10 {EntryComputeGeometry procedure} {unix && fonts} {
+test entry-6.10 {EntryComputeGeometry procedure} {unixOnly fonts} {
     catch {destroy .e}
     entry .e -bd 1 -relief raised -width 0 -show .
     .e insert 0 12345
@@ -1165,26 +1165,26 @@ test entry-13.9 {GetEntryIndex procedure} {
     list [.e index sel.first] [.e index sel.last]
 } {1 6}
 selection clear .e
-test entry-13.10 {GetEntryIndex procedure} {unix} {
+test entry-13.10 {GetEntryIndex procedure} {unixOnly} {
     # On unix, when selection is cleared, entry widget's internal 
     # selection range is reset.
 
     list [catch {.e index sel.first} msg] $msg
 } {1 {selection isn't in entry}}
-test entry-13.11 {GetEntryIndex procedure} {!unix} {
+test entry-13.11 {GetEntryIndex procedure} {macOrPc} {
     # On mac and pc, when selection is cleared, entry widget remembers
     # last selected range.  When selection ownership is restored to 
     # entry, the old range will be rehighlighted.
 
     list [catch {selection get}] [.e index sel.first]
 } {1 1}
-test entry-13.12 {GetEntryIndex procedure} {unix} {
+test entry-13.12 {GetEntryIndex procedure} {unixOnly} {
     list [catch {.e index sbogus} msg] $msg
 } {1 {selection isn't in entry}}
-test entry-13.13 {GetEntryIndex procedure} {!unix} {
+test entry-13.13 {GetEntryIndex procedure} {macOrPc} {
     list [catch {.e index sbogus} msg] $msg
 } {1 {bad entry index "sbogus"}}
-test entry-13.14 {GetEntryIndex procedure} {!unix} {
+test entry-13.14 {GetEntryIndex procedure} {macOrPc} {
     list [catch {selection get}] [catch {.e index sbogus}]
 } {1 1}
 test entry-13.15 {GetEntryIndex procedure} {
@@ -1285,7 +1285,7 @@ test entry-16.1 {EntryVisibleRange procedure} {fonts} {
     .e insert 0 .............................
     .e xview
 } {0 0.827586}
-test entry-15.2 {EntryVisibleRange procedure} {unix && fonts} {
+test entry-15.2 {EntryVisibleRange procedure} {unixOnly fonts} {
     .e configure -show X
     .e delete 0 end
     .e insert 0 .............................
@@ -1360,5 +1360,17 @@ test entry-18.1 {Entry widget vs hiding} {
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/event.test b/tests/event.test
index 046b4f7..ed686a6 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: event.test,v 1.1.4.2 1999/03/11 18:50:47 hershey Exp $
+# RCS: @(#) $Id: event.test,v 1.1.4.3 1999/03/24 01:16:44 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -40,5 +40,17 @@ test event-1.1 {Tk_HandleEvent procedure, filter events for dead windows} {
 } {destroy}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/filebox.test b/tests/filebox.test
index d88bb4e..510a557 100644
--- a/tests/filebox.test
+++ b/tests/filebox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: filebox.test,v 1.1.4.5 1999/03/11 23:51:26 hershey Exp $
+# RCS: @(#) $Id: filebox.test,v 1.1.4.6 1999/03/24 01:16:45 hershey Exp $
 #
 
 set tk_strictMotif_old $tk_strictMotif
@@ -89,7 +89,7 @@ proc SendButtonPress {parent btn type} {
 #
 #----------------------------------------------------------------------
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -160,7 +160,7 @@ foreach mode $modes {
 	    set isNative 0
 	}
 
-	if {$isNative && ![info exists INTERACTIVE]} {
+	if {$isNative && ![info exists tcl_interactive]} {
 	    continue
 	}
 
@@ -288,13 +288,24 @@ foreach mode $modes {
 
 set tk_strictMotif $tk_strictMotif_old
 
-if {$isNative && ![info exists INTERACTIVE]} {
+if {$isNative && ![info exists tcl_interactive]} {
     puts " Some tests were skipped because they could not be performed"
     puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
+    puts " run them in an interactive shell."
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/focus.test b/tests/focus.test
index 481848a..20f935c 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -6,14 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: focus.test,v 1.1.4.3 1999/03/11 18:50:48 hershey Exp $
+# RCS: @(#) $Id: focus.test,v 1.1.4.4 1999/03/24 01:16:45 hershey Exp $
 
-if {$tcl_platform(platform) != "unix"} {
-    puts "skipping: Unix only tests..."
-    return
-}
-
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -47,7 +42,7 @@ proc focusSetupAlt {} {
 }
 
 # Make sure the window manager knows who has focus
-fixfocus
+catch {fixfocus}
 
 # The following procedure ensures that there is no input focus
 # in this application.  It does it by arranging for another
@@ -65,8 +60,8 @@ proc focusClear {} {
 }
 
 focusSetup
-set altDisplay [info exists env(TK_ALT_DISPLAY)]
-if $altDisplay {
+set ::tcltest::testConfig(altDisplay) [info exists env(TK_ALT_DISPLAY)]
+if {$::tcltest::testConfig(altDisplay)} {
     focusSetupAlt
 }
 update
@@ -81,37 +76,35 @@ bind all <KeyPress> {
     append focusInfo "press %W %K"
 }
 
-test focus-1.1 {Tk_FocusCmd procedure} {
+test focus-1.1 {Tk_FocusCmd procedure} {unixOnly} {
     focusClear
     focus
 } {}
-if $altDisplay {
-    test focus-1.2 {Tk_FocusCmd procedure} {
-	focus .alt.b
-	focus
-    } {}
-}
-test focus-1.3 {Tk_FocusCmd procedure} {
+test focus-1.2 {Tk_FocusCmd procedure} {unixOnly altDisplay} {
+    focus .alt.b
+    focus
+} {}
+test focus-1.3 {Tk_FocusCmd procedure} {unixOnly} {
     focusClear
     focus .t.b3
     focus
 } {}
-test focus-1.4 {Tk_FocusCmd procedure} {
+test focus-1.4 {Tk_FocusCmd procedure} {unixOnly} {
     list [catch {focus ""} msg] $msg
 } {0 {}}
-test focus-1.5 {Tk_FocusCmd procedure} {
+test focus-1.5 {Tk_FocusCmd procedure} {unixOnly} {
     focusClear
     focus -force .t
     focus .t.b3
     focus
 } {.t.b3}
-test focus-1.6 {Tk_FocusCmd procedure} {
+test focus-1.6 {Tk_FocusCmd procedure} {unixOnly} {
     list [catch {focus .gorp} msg] $msg
 } {1 {bad window path name ".gorp"}}
-test focus-1.7 {Tk_FocusCmd procedure} {
+test focus-1.7 {Tk_FocusCmd procedure} {unixOnly} {
     list [catch {focus .gorp a} msg] $msg
 } {1 {bad option ".gorp": must be -displayof, -force, or -lastfor}}
-test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} {
+test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} {unixOnly} {
     toplevel .t2
     wm geom .t2 +10+10
     frame .t2.f -width 200 -height 100 -bd 2 -relief raised
@@ -130,91 +123,88 @@ test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} {
     destroy .t2
     set x
 } {.t2.f2 .t2 .t2}
-test focus-1.9 {Tk_FocusCmd procedure, -displayof option} {
+test focus-1.9 {Tk_FocusCmd procedure, -displayof option} {unixOnly} {
     list [catch {focus -displayof} msg] $msg
 } {1 {wrong # args: should be "focus -displayof window"}}
-test focus-1.10 {Tk_FocusCmd procedure, -displayof option} {
+test focus-1.10 {Tk_FocusCmd procedure, -displayof option} {unixOnly} {
     list [catch {focus -displayof a b} msg] $msg
 } {1 {wrong # args: should be "focus -displayof window"}}
-test focus-1.11 {Tk_FocusCmd procedure, -displayof option} {
+test focus-1.11 {Tk_FocusCmd procedure, -displayof option} {unixOnly} {
     list [catch {focus -displayof .lousy} msg] $msg
 } {1 {bad window path name ".lousy"}}
-test focus-1.12 {Tk_FocusCmd procedure, -displayof option} {
+test focus-1.12 {Tk_FocusCmd procedure, -displayof option} {unixOnly} {
     focusClear
     focus .t
     focus -displayof .t.b3
 } {}
-test focus-1.13 {Tk_FocusCmd procedure, -displayof option} {
+test focus-1.13 {Tk_FocusCmd procedure, -displayof option} {unixOnly} {
     focusClear
     focus -force .t
     focus -displayof .t.b3
 } {.t}
-if $altDisplay {
-    test focus-1.14 {Tk_FocusCmd procedure, -displayof option} {
-	focus -force .alt.c
-	focus -displayof .alt
-    } {.alt.c}
-}
-test focus-1.15 {Tk_FocusCmd procedure, -force option} {
+test focus-1.14 {Tk_FocusCmd procedure, -displayof option} {unixOnly altDisplay} {
+    focus -force .alt.c
+    focus -displayof .alt
+} {.alt.c}
+test focus-1.15 {Tk_FocusCmd procedure, -force option} {unixOnly} {
     list [catch {focus -force} msg] $msg
 } {1 {wrong # args: should be "focus -force window"}}
-test focus-1.16 {Tk_FocusCmd procedure, -force option} {
+test focus-1.16 {Tk_FocusCmd procedure, -force option} {unixOnly} {
     list [catch {focus -force a b} msg] $msg
 } {1 {wrong # args: should be "focus -force window"}}
-test focus-1.17 {Tk_FocusCmd procedure, -force option} {
+test focus-1.17 {Tk_FocusCmd procedure, -force option} {unixOnly} {
     list [catch {focus -force foo} msg] $msg
 } {1 {bad window path name "foo"}}
-test focus-1.18 {Tk_FocusCmd procedure, -force option} {
+test focus-1.18 {Tk_FocusCmd procedure, -force option} {unixOnly} {
     list [catch {focus -force ""} msg] $msg
 } {0 {}}
-test focus-1.19 {Tk_FocusCmd procedure, -force option} {
+test focus-1.19 {Tk_FocusCmd procedure, -force option} {unixOnly} {
     focusClear
     focus .t.b1
     set x  [list [focus]]
     focus -force .t.b1
     lappend x [focus]
 } {{} .t.b1}
-test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} {
+test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} {unixOnly} {
     list [catch {focus -lastfor} msg] $msg
 } {1 {wrong # args: should be "focus -lastfor window"}}
-test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} {
+test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} {unixOnly} {
     list [catch {focus -lastfor 1 2} msg] $msg
 } {1 {wrong # args: should be "focus -lastfor window"}}
-test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} {
+test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} {unixOnly} {
     list [catch {focus -lastfor who_knows?} msg] $msg
 } {1 {bad window path name "who_knows?"}}
-test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} {
+test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} {unixOnly} {
     focus .b
     focus .t.b1
     list [focus -lastfor .] [focus -lastfor .t.b3]
 } {.b .t.b1}
-test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} {
+test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} {unixOnly} {
     destroy .t
     focusSetup
     update
     focus -lastfor .t.b2
 } {.t}
-test focus-1.25 {Tk_FocusCmd procedure} {
+test focus-1.25 {Tk_FocusCmd procedure} {unixOnly} {
     list [catch {focus -unknown} msg] $msg
 } {1 {bad option "-unknown": must be -displayof, -force, or -lastfor}}
 
-if {[string compare testwrapper [info commands testwrapper]] != 0} {
-    puts "This application hasn't been compiled with the testwrapper command,"
-    puts "therefore I am skipping all of these tests."
-    cleanupbg
-    return
-}
+# Some tests require the testwrapper command
 
-test focus-2.1 {TkFocusFilterEvent procedure} {nonPortable} {
+set ::tcltest::testConfig(testwrapper) \
+	[expr {[info commands testwrapper] != {}}]
+
+test focus-2.1 {TkFocusFilterEvent procedure} {unixOnly nonPortable testwrapper} {
     focus -force .b
     destroy .t
     focusSetup
     update
     set focusInfo {}
-    event gen [testwrapper .t] <FocusIn> -detail NotifyAncestor -sendevent 0x54217567
+    event gen [testwrapper .t] <FocusIn> -detail NotifyAncestor \
+	    -sendevent 0x54217567
     list $focusInfo
 } {{}}
-test focus-2.2 {TkFocusFilterEvent procedure} {nonPortable} {
+test focus-2.2 {TkFocusFilterEvent procedure} {unixOnly nonPortable testwrapper} {
     focus -force .b
     destroy .t
     focusSetup
@@ -224,7 +214,7 @@ test focus-2.2 {TkFocusFilterEvent procedure} {nonPortable} {
     list $focusInfo [focus]
 } {{in .t NotifyAncestor
 } .b}
-test focus-2.3 {TkFocusFilterEvent procedure} {nonPortable} {
+test focus-2.3 {TkFocusFilterEvent procedure} {unixOnly nonPortable testwrapper} {
     focus -force .b
     destroy .t
     focusSetup
@@ -237,7 +227,8 @@ test focus-2.3 {TkFocusFilterEvent procedure} {nonPortable} {
 out . NotifyNonlinearVirtual
 in .t NotifyNonlinear
 } .t}
-test focus-2.4 {TkFocusFilterEvent procedure, FocusIn events} {nonPortable} {
+test focus-2.4 {TkFocusFilterEvent procedure, FocusIn events} \
+	{unixOnly nonPortable testwrapper} {
     set result {}
     focus .t.b1
     # Important to end with NotifyAncestor, which is an
@@ -267,7 +258,8 @@ in .t.b1 NotifyNonlinear
 in .t NotifyNonlinearVirtual
 in .t.b1 NotifyNonlinear
 }}
-test focus-2.5 {TkFocusFilterEvent procedure, creating FocusInfo struct} {nonPortable} {
+test focus-2.5 {TkFocusFilterEvent procedure, creating FocusInfo struct} \
+	{unixOnly nonPortable testwrapper} {
     focusSetup
     focus .t.b1
     update
@@ -277,7 +269,8 @@ test focus-2.5 {TkFocusFilterEvent procedure, creating FocusInfo struct} {nonPor
 in .t NotifyNonlinearVirtual
 in .t.b1 NotifyNonlinear
 } .t.b1}
-test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} {
+test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} \
+	{unixOnly testwrapper} {
     focus .t.b1
     focus .
     update
@@ -287,7 +280,8 @@ test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} {
     event gen . <KeyPress-x>
     list $x $focusInfo
 } {.t.b1 {press .t.b1 x}}
-test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} {
+test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} \
+	{unixOnly testwrapper} {
     set result {}
     foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear
 	    NotifyNonlinearVirtual NotifyPointer NotifyPointerRoot
@@ -299,17 +293,20 @@ test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} {
     }
     set result
 } {{} .t.b1 {} {} .t.b1 .t.b1 {}}
-test focus-2.8 {TkFocusFilterEvent procedure, FocusOut events} {
+test focus-2.8 {TkFocusFilterEvent procedure, FocusOut events} \
+	{unixOnly testwrapper} {
     focus -force .t.b1
     event gen .t.b1 <FocusOut> -detail NotifyAncestor
     focus
 } {.t.b1}
-test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} {
+test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} \
+	{unixOnly testwrapper} {
     focus .t.b1
     event gen [testwrapper .] <FocusOut> -detail NotifyAncestor
     focus
 } {}
-test focus-2.10 {TkFocusFilterEvent procedure, Enter events} {
+test focus-2.10 {TkFocusFilterEvent procedure, Enter events} \
+	{unixOnly testwrapper} {
     set result {}
     focus .t.b1
     focusClear
@@ -323,14 +320,16 @@ test focus-2.10 {TkFocusFilterEvent procedure, Enter events} {
     }
     set result
 } {.t.b1 {} .t.b1 .t.b1 .t.b1}
-test focus-2.11 {TkFocusFilterEvent procedure, Enter events} {
+test focus-2.11 {TkFocusFilterEvent procedure, Enter events} \
+	{unixOnly testwrapper} {
     focusClear
     set focusInfo {}
     event gen [testwrapper .t] <Enter> -detail NotifyAncestor
     update
     set focusInfo
 } {}
-test focus-2.12 {TkFocusFilterEvent procedure, Enter events} {
+test focus-2.12 {TkFocusFilterEvent procedure, Enter events} \
+	{unixOnly testwrapper} {
     focus -force .b
     update
     set focusInfo {}
@@ -338,7 +337,8 @@ test focus-2.12 {TkFocusFilterEvent procedure, Enter events} {
     update
     set focusInfo
 } {}
-test focus-2.13 {TkFocusFilterEvent procedure, Enter events} {
+test focus-2.13 {TkFocusFilterEvent procedure, Enter events} \
+	{unixOnly testwrapper} {
     focus .t.b1
     focusClear
     event gen [testwrapper .t] <Enter> -detail NotifyAncestor -focus 1
@@ -348,7 +348,7 @@ test focus-2.13 {TkFocusFilterEvent procedure, Enter events} {
 } {in .t NotifyVirtual
 in .t.b1 NotifyAncestor
 }
-test focus-2.14 {TkFocusFilterEvent procedure, Enter events, ignore errors when setting focus due to implicit focus} {
+test focus-2.14 {TkFocusFilterEvent procedure, Enter events, ignore errors when setting focus due to implicit focus} {unixOnly testwrapper} {
     focusClear
     catch {destroy .t2}
     toplevel .t2
@@ -359,7 +359,8 @@ test focus-2.14 {TkFocusFilterEvent procedure, Enter events, ignore errors when
     update
     destroy .t2
 } {}
-test focus-2.15 {TkFocusFilterEvent procedure, Leave events} {
+test focus-2.15 {TkFocusFilterEvent procedure, Leave events} \
+	{unixOnly testwrapper} {
     set result {}
     focus .t.b1
     foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear
@@ -373,7 +374,8 @@ test focus-2.15 {TkFocusFilterEvent procedure, Leave events} {
     }
     set result
 } {{} .t.b1 {} {} {}}
-test focus-2.16 {TkFocusFilterEvent procedure, Leave events} {
+test focus-2.16 {TkFocusFilterEvent procedure, Leave events} \
+	{unixOnly testwrapper} {
     set result {}
     focus .t.b1
     event gen [testwrapper .t] <Enter> -detail NotifyAncestor -focus 1
@@ -385,7 +387,8 @@ test focus-2.16 {TkFocusFilterEvent procedure, Leave events} {
 } {out .t.b1 NotifyAncestor
 out .t NotifyVirtual
 }
-test focus-2.17 {TkFocusFilterEvent procedure, Leave events} {
+test focus-2.17 {TkFocusFilterEvent procedure, Leave events} \
+	{unixOnly testwrapper} {
     set result {}
     focus .t.b1
     event gen [testwrapper .t] <Enter> -detail NotifyAncestor -focus 1
@@ -399,7 +402,8 @@ test focus-2.17 {TkFocusFilterEvent procedure, Leave events} {
 out .t NotifyVirtual
 } {}}
 
-test focus-3.1 {SetFocus procedure, create record on focus} {
+test focus-3.1 {SetFocus procedure, create record on focus} \
+	{unixOnly testwrapper} {
     toplevel .t2 -width 250 -height 100
     wm geometry .t2 +0+0
     update
@@ -411,7 +415,8 @@ catch {destroy .t2}
 # This test produces no result, but it will generate a protocol
 # error if Tk forgets to make the window exist before focussing
 # on it.
-test focus-3.2 {SetFocus procedure, making window exist} {
+test focus-3.2 {SetFocus procedure, making window exist} \
+	{unixOnly testwrapper} {
     update
     button .b2 -text "Another button"
     focus .b2
@@ -421,12 +426,14 @@ catch {destroy .b2}
 update
 # The following test doesn't produce a check-able result, but if
 # there are bugs it may generate an X protocol error.
-test focus-3.3 {SetFocus procedure, delaying claim of X focus} {
+test focus-3.3 {SetFocus procedure, delaying claim of X focus} \
+	{unixOnly testwrapper} {
     focusSetup
     focus -force .t.b2
     update
 } {}
-test focus-3.4 {SetFocus procedure, delaying claim of X focus} {
+test focus-3.4 {SetFocus procedure, delaying claim of X focus} \
+	{unixOnly testwrapper} {
     focusSetup
     wm withdraw .t
     focus -force .t.b2
@@ -439,7 +446,8 @@ test focus-3.4 {SetFocus procedure, delaying claim of X focus} {
     wm deiconify .t
 } {}
 catch {destroy .t2}
-test focus-3.5 {SetFocus procedure, generating events} {
+test focus-3.5 {SetFocus procedure, generating events} \
+	{unixOnly testwrapper} {
     focusSetup
     focusClear
     set focusInfo {}
@@ -449,7 +457,8 @@ test focus-3.5 {SetFocus procedure, generating events} {
 } {in .t NotifyVirtual
 in .t.b2 NotifyAncestor
 }
-test focus-3.6 {SetFocus procedure, generating events} {
+test focus-3.6 {SetFocus procedure, generating events} \
+	{unixOnly testwrapper} {
     focusSetup
     focus -force .b
     update
@@ -462,7 +471,8 @@ out . NotifyNonlinearVirtual
 in .t NotifyNonlinearVirtual
 in .t.b2 NotifyNonlinear
 }
-test focus-3.7 {SetFocus procedure, generating events} {nonPortable} {
+test focus-3.7 {SetFocus procedure, generating events} \
+	{unixOnly nonPortable testwrapper} {
     # Non-portable because some platforms generate extra events.
 
     focusSetup
@@ -473,7 +483,7 @@ test focus-3.7 {SetFocus procedure, generating events} {nonPortable} {
     set focusInfo
 } {}
 
-test focus-4.1 {TkFocusDeadWindow procedure} {
+test focus-4.1 {TkFocusDeadWindow procedure} {unixOnly testwrapper} {
     focusSetup
     update
     focus -force .b
@@ -481,7 +491,7 @@ test focus-4.1 {TkFocusDeadWindow procedure} {
     destroy .t
     focus
 } {.b}
-test focus-4.2 {TkFocusDeadWindow procedure} {
+test focus-4.2 {TkFocusDeadWindow procedure} {unixOnly testwrapper} {
     focusSetup
     update
     focus -force .t.b2
@@ -495,7 +505,7 @@ test focus-4.2 {TkFocusDeadWindow procedure} {
 # Non-portable due to wm-specific redirection of input focus when
 # windows are deleted:
 
-test focus-4.3 {TkFocusDeadWindow procedure} {nonPortable} {
+test focus-4.3 {TkFocusDeadWindow procedure} {unixOnly nonPortable testwrapper} {
     focusSetup
     update
     focus .t
@@ -504,7 +514,7 @@ test focus-4.3 {TkFocusDeadWindow procedure} {nonPortable} {
     update
     focus
 } {}
-test focus-4.4 {TkFocusDeadWindow procedure} {
+test focus-4.4 {TkFocusDeadWindow procedure} {unixOnly testwrapper} {
     focusSetup
     focus -force .t.b2
     update
@@ -515,7 +525,8 @@ test focus-4.4 {TkFocusDeadWindow procedure} {
 # I don't know how to test most of the remaining procedures of this file
 # explicitly;  they've already been exercised by the preceding tests.
 
-test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} {
+test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} \
+	{unixOnly testwrapper} {
     focusSetup
     focus -force .t
     update
@@ -534,7 +545,8 @@ bind all <KeyPress> {}
 cleanupbg
 fixfocus
 
-test focus-6.1 {miscellaneous - embedded application in same process} {unixOnly} {
+test focus-6.1 {miscellaneous - embedded application in same process} \
+	{unixOnly testwrapper} {
     eval interp delete [interp slaves]
     catch {destroy .t}
     toplevel .t
@@ -583,7 +595,8 @@ test focus-6.1 {miscellaneous - embedded application in same process} {unixOnly}
     interp delete child
     set result
 } {{.t.f2.e1 {} {focus out .t.f2.e1 NotifyNonlinear} {focus out .t.f2 NotifyNonlinearVirtual} {focus in .t.f1 NotifyNonlinear} | {focus out .t.f1 NotifyNonlinear} {focus in .t.f2 NotifyNonlinearVirtual} {focus in .t.f2.e1 NotifyNonlinear}} {{focus in . NotifyVirtual} {focus in .e1 NotifyAncestor} | {focus out .e1 NotifyAncestor} {focus out . NotifyVirtual}}}
-test focus-6.2 {miscellaneous - embedded application in different process} {unixOnly} {
+test focus-6.2 {miscellaneous - embedded application in different process} \
+	{unixOnly testwrapper} {
     eval interp delete [interp slaves]
     catch {destroy .t}
     setupbg
@@ -637,5 +650,17 @@ bind all <FocusIn> {}
 bind all <FocusOut> {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/focusTcl.test b/tests/focusTcl.test
index 0741a6a..8059c40 100644
--- a/tests/focusTcl.test
+++ b/tests/focusTcl.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: focusTcl.test,v 1.1.4.2 1999/03/11 18:50:49 hershey Exp $
+# RCS: @(#) $Id: focusTcl.test,v 1.1.4.3 1999/03/24 01:16:46 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -278,5 +278,17 @@ bind Frame <Key> {}
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/font.test b/tests/font.test
index 5b60f95..414254e 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -6,14 +6,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: font.test,v 1.1.4.3 1999/03/11 18:50:50 hershey Exp $
+# RCS: @(#) $Id: font.test,v 1.1.4.4 1999/03/24 01:16:46 hershey Exp $
 
 if {[info commands testfont] != "testfont"} {
     puts "testfont command not available; skipping tests"
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -140,7 +140,7 @@ test font-4.8 {font command: actual: all attributes} {
     # not (objc > 3) so objPtr = NULL
     lindex [font actual {-family times}] 0
 } {-family}
-test font-4.9 {font command: actual} {unix || mac} {
+test font-4.9 {font command: actual} {macOrUnix} {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
 } {times}
@@ -1371,5 +1371,17 @@ setup
 destroy .b
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/frame.test b/tests/frame.test
index 048e4f7..fa49132 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: frame.test,v 1.1.4.2 1999/03/11 18:50:50 hershey Exp $
+# RCS: @(#) $Id: frame.test,v 1.1.4.3 1999/03/24 01:16:47 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -616,5 +616,17 @@ rename eatColors {}
 rename colorsFree {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/geometry.test b/tests/geometry.test
index c06e196..950bad7 100644
--- a/tests/geometry.test
+++ b/tests/geometry.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: geometry.test,v 1.1.4.2 1999/03/11 18:50:51 hershey Exp $
+# RCS: @(#) $Id: geometry.test,v 1.1.4.3 1999/03/24 01:16:48 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -250,5 +250,17 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} {
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/get.test b/tests/get.test
index e787524..34a7e71 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: get.test,v 1.1.2.3 1999/03/11 18:50:52 hershey Exp $
+# RCS: @(#) $Id: get.test,v 1.1.2.4 1999/03/24 01:16:48 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -80,5 +80,17 @@ test get-2.4 {Tk_GetJustifyFromObj - error} {
 } {1 {bad justification "stupid": must be left, right, or center}}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/grid.test b/tests/grid.test
index 716ff48..76412ba 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: grid.test,v 1.1.4.3 1999/03/11 18:50:52 hershey Exp $
+# RCS: @(#) $Id: grid.test,v 1.1.4.4 1999/03/24 01:16:49 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -1213,5 +1213,17 @@ test grid-17.1 {forget and pending idle handlers} {
 } ok
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/id.test b/tests/id.test
index b5e2311..1005bfc 100644
--- a/tests/id.test
+++ b/tests/id.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: id.test,v 1.1.4.2 1999/03/11 18:50:53 hershey Exp $
+# RCS: @(#) $Id: id.test,v 1.1.4.3 1999/03/24 01:16:50 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -101,5 +101,17 @@ test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly} {
 bind all <Destroy> {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/image.test b/tests/image.test
index e483155..a15944c 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: image.test,v 1.1.4.2 1999/03/11 18:50:53 hershey Exp $
+# RCS: @(#) $Id: image.test,v 1.1.4.3 1999/03/24 01:16:50 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
@@ -16,7 +16,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -356,5 +356,17 @@ destroy .c
 eval image delete [image names]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index 81ee69c..d79bfe5 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: imgBmap.test,v 1.1.4.2 1999/03/11 18:50:54 hershey Exp $
+# RCS: @(#) $Id: imgBmap.test,v 1.1.4.3 1999/03/24 01:16:51 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -473,5 +473,17 @@ destroy .c
 eval image delete [image names]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/imgPPM.test b/tests/imgPPM.test
index 567e9ae..6e9139c 100644
--- a/tests/imgPPM.test
+++ b/tests/imgPPM.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: imgPPM.test,v 1.1.4.2 1999/03/11 18:50:54 hershey Exp $
+# RCS: @(#) $Id: imgPPM.test,v 1.1.4.3 1999/03/24 01:16:51 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -155,5 +155,17 @@ removeFile test2.ppm
 eval image delete [image names]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 6fcefbb..88ce401 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -9,9 +9,9 @@
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
 #
-# RCS: @(#) $Id: imgPhoto.test,v 1.1.4.3 1999/03/11 18:50:55 hershey Exp $
+# RCS: @(#) $Id: imgPhoto.test,v 1.1.4.4 1999/03/24 01:16:52 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -29,8 +29,8 @@ update
 
 # temporarily copy the README fiel from testsDir to tmpDir
 if {![file exists README]} {
-    set newREADME [file join $::test::tmpDir README]
-    file copy [file join $::test::testsDir README] $newREADME
+    set newREADME [file join $::tcltest::tmpDir README]
+    file copy [file join $::tcltest::testsDir README] $newREADME
     set removeREADME 1
 }
 
@@ -40,7 +40,7 @@ if {![file exists README]} {
 # skip this file if you can't find the teapot.ppm file.
 set teapotPhotoFile [file join $tk_library demos images teapot.ppm]
 if {![file exists $teapotPhotoFile]} {
-    set newLib [file dirname $::test::testsDir]
+    set newLib [file dirname $::tcltest::testsDir]
     set teapotPhotoFile \
 	[file join $newLib library demos images teapot.ppm]
     if {![file exists $teapotPhotoFile]} {
@@ -443,5 +443,17 @@ eval image delete [image names]
 if {[info exists removeREADME]} {
     catch {file delete -force $newREADME}
 }
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/listbox.test b/tests/listbox.test
index 06e051c..8488da3 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: listbox.test,v 1.1.4.2 1999/03/11 18:50:55 hershey Exp $
+# RCS: @(#) $Id: listbox.test,v 1.1.4.3 1999/03/24 01:16:52 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -1657,5 +1657,17 @@ catch {destroy .partial}
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/macEmbed.test b/tests/macEmbed.test
index 8d23015..a33690b 100644
--- a/tests/macEmbed.test
+++ b/tests/macEmbed.test
@@ -6,14 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macEmbed.test,v 1.1.4.2 1999/03/11 18:50:56 hershey Exp $
+# RCS: @(#) $Id: macEmbed.test,v 1.1.4.3 1999/03/24 01:16:53 hershey Exp $
 
-if {$tcl_platform(platform) != "macintosh"} {
-    puts "skipping: Mac only tests..."
-    return
-}
-
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -22,11 +17,11 @@ wm geometry . {}
 raise .
 
 
-test macEmbed-1.1 {TkpUseWindow procedure, bad window identifier} {
+test macEmbed-1.1 {TkpUseWindow procedure, bad window identifier} {macOnly} {
     catch {destroy .t}
     list [catch {toplevel .t -use xyz} msg] $msg
 } {1 {expected integer but got "xyz"}}
-test macEmbed-1.2 {TkpUseWindow procedure, bad window identifier} {
+test macEmbed-1.2 {TkpUseWindow procedure, bad window identifier} {macOnly} {
     catch {destroy .t}
     list [catch {toplevel .t -use 47} msg] $msg
 } {1 {The window ID 47 does not correspond to a valid Tk Window.}}
@@ -37,7 +32,7 @@ if {[string compare testembed [info commands testembed]] != 0} {
     return
 }
 
-test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {
+test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {macOnly} {
     eval destroy [winfo child .]
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
@@ -46,7 +41,7 @@ test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} {
 	toplevel .t -use $w
 	list [testembed] [expr [lindex [lindex [testembed all] 1] 0] - $w]
 } {{{XXX .f2 {} {}} {XXX .f1 XXX .t}} 0}
-test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {
+test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {macOnly} {
     eval destroy [winfo child .]
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
@@ -61,7 +56,7 @@ test macEmbed-1.4 {TkpUseWindow procedure, creating Container records} {
 # Can't think of any way to test the procedures TkpMakeWindow,
 # TkpMakeContainer, or EmbedErrorProc.
 
-test macEmbed-2.1 {EmbeddedEventProc procedure} {
+test macEmbed-2.1 {EmbeddedEventProc procedure} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -74,7 +69,7 @@ test macEmbed-2.1 {EmbeddedEventProc procedure} {
     update
 	testembed
 } {}
-test macEmbed-2.2 {EmbeddedEventProc procedure} {
+test macEmbed-2.2 {EmbeddedEventProc procedure} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -85,7 +80,7 @@ test macEmbed-2.2 {EmbeddedEventProc procedure} {
     destroy .f1
     testembed
 } {}
-test macEmbed-2.3 {EmbeddedEventProc procedure} {
+test macEmbed-2.3 {EmbeddedEventProc procedure} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -98,7 +93,7 @@ test macEmbed-2.3 {EmbeddedEventProc procedure} {
     list [testembed] [winfo children .]
 } {{} {}}
 
-test macEmbed-3.1 {EmbeddedEventProc procedure, detect creation} {
+test macEmbed-3.1 {EmbeddedEventProc procedure, detect creation} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -110,7 +105,8 @@ test macEmbed-3.1 {EmbeddedEventProc procedure, detect creation} {
 	wm withdraw .t1
     list $x [testembed]
 } {{{XXX .f1 {} {}}} {{XXX .f1 XXX .t1}}}
-test macEmbed-3.2 {EmbeddedEventProc procedure, disallow position changes} {
+test macEmbed-3.2 {EmbeddedEventProc procedure, disallow position changes} \
+	{macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -123,7 +119,8 @@ test macEmbed-3.2 {EmbeddedEventProc procedure, disallow position changes} {
     update
 	wm geometry .t1
 } {200x200+0+0}
-test macEmbed-3.3 {EmbeddedEventProc procedure, disallow position changes} {
+test macEmbed-3.3 {EmbeddedEventProc procedure, disallow position changes} \
+	{macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -136,7 +133,7 @@ test macEmbed-3.3 {EmbeddedEventProc procedure, disallow position changes} {
     update
 	wm geometry .t1
 } {300x100+0+0}
-test macEmbed-3.4 {EmbeddedEventProc procedure, geometry requests} {
+test macEmbed-3.4 {EmbeddedEventProc procedure, geometry requests} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -148,7 +145,7 @@ test macEmbed-3.4 {EmbeddedEventProc procedure, geometry requests} {
     update
     list [winfo width .t1] [winfo height .t1] [wm geometry .t2]
 } {300 80 300x80+0+0}
-test macEmbed-3.5 {EmbeddedEventProc procedure, map requests} {
+test macEmbed-3.5 {EmbeddedEventProc procedure, map requests} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -163,7 +160,7 @@ test macEmbed-3.5 {EmbeddedEventProc procedure, map requests} {
 	update
 	set x
 } {mapped}
-test macEmbed-3.6 {EmbeddedEventProc procedure, destroy events} {
+test macEmbed-3.6 {EmbeddedEventProc procedure, destroy events} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -179,7 +176,7 @@ test macEmbed-3.6 {EmbeddedEventProc procedure, destroy events} {
     list $x [winfo exists .f1]
 } {dead 0}
 
-test macEmbed-4.1 {EmbedStructureProc procedure, configure events} {
+test macEmbed-4.1 {EmbedStructureProc procedure, configure events} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -192,7 +189,7 @@ test macEmbed-4.1 {EmbedStructureProc procedure, configure events} {
     update
 	winfo geometry .t1
 } {180x100+0+0}
-test macEmbed-4.2 {EmbedStructureProc procedure, destroy events} {
+test macEmbed-4.2 {EmbedStructureProc procedure, destroy events} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -208,7 +205,7 @@ test macEmbed-4.2 {EmbedStructureProc procedure, destroy events} {
 
 # Can't think up any tests for TkpGetOtherWindow procedure.
 
-test unixEmbed-5.1 {TkpClaimFocus procedure} {tempNotMac} {
+test unixEmbed-5.1 {TkpClaimFocus procedure} {macOnly tempNotMac} {
     catch {interp delete child}
     foreach w [winfo child .] {
 	catch {destroy $w}
@@ -233,7 +230,7 @@ test unixEmbed-5.1 {TkpClaimFocus procedure} {tempNotMac} {
 } {{{} .} .f1}
 catch {interp delete child}
 
-test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {
+test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -250,7 +247,7 @@ test macEmbed-6.1 {EmbedWindowDeleted procedure, check parentPtr} {
     }
     set x
 } {{{XXX .f4 {} {}} {XXX .f3 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f4 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}}} {}}
-test macEmbed-6.2 {EmbedWindowDeleted procedure, check embeddedPtr} {
+test macEmbed-6.2 {EmbedWindowDeleted procedure, check embeddedPtr} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -265,7 +262,7 @@ test macEmbed-6.2 {EmbedWindowDeleted procedure, check embeddedPtr} {
 	lappend x [testembed]
 } {{{XXX .f1 XXX .t1}} {}}
 
-test macEmbed-7.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {
+test macEmbed-7.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -277,7 +274,7 @@ test macEmbed-7.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {
     update
     wm geometry .t1
 } {150x80+0+0}
-test macEmbed-7.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {
+test macEmbed-7.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} {macOnly} {
     foreach w [winfo child .] {
 	catch {destroy $w}
     }
@@ -297,5 +294,17 @@ foreach w [winfo child .] {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/macFont.test b/tests/macFont.test
index a6d20d1..b04a16d 100644
--- a/tests/macFont.test
+++ b/tests/macFont.test
@@ -10,14 +10,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macFont.test,v 1.1.4.3 1999/03/11 18:50:57 hershey Exp $
+# RCS: @(#) $Id: macFont.test,v 1.1.4.4 1999/03/24 01:16:54 hershey Exp $
 
 if {$tcl_platform(platform)!="macintosh"} {
     puts "skipping: Mac only tests..."
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -44,11 +44,11 @@ proc getsize {} {
     return "[winfo reqwidth .b.l] [winfo reqheight .b.l]"
 }
 
-set ::test::testConfig(gothic) 0
+set ::tcltest::testConfig(gothic) 0
 set gothic {gothic 12}
 set mx [font measure  $gothic \u4e4e]
 if {[font actual $gothic -family] != [font actual system -family]} {
-    set ::test::testConfig(gothic) 1
+    set ::tcltest::testConfig(gothic) 1
 }
 
 test macFont-1.1 {TkpFontPkgInit} {
@@ -284,5 +284,17 @@ test macFont-9.4 {AllocMacFont: extract text metrics} {
 destroy .b
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/macMenu.test b/tests/macMenu.test
index e0eb389..9f90112 100644
--- a/tests/macMenu.test
+++ b/tests/macMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macMenu.test,v 1.1.4.2 1999/03/11 18:50:57 hershey Exp $
+# RCS: @(#) $Id: macMenu.test,v 1.1.4.3 1999/03/24 01:16:54 hershey Exp $
 
 if {$tcl_platform(platform) != "macintosh"} {
     puts "skipping: Mac only tests..."
@@ -21,7 +21,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -1563,5 +1563,17 @@ test macMenu-45.1 {TkpMenuInit - called at boot time} {} {}
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/macWinMenu.test b/tests/macWinMenu.test
index 2c51bea..1f30dc8 100644
--- a/tests/macWinMenu.test
+++ b/tests/macWinMenu.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macWinMenu.test,v 1.1.4.2 1999/03/11 18:50:58 hershey Exp $
+# RCS: @(#) $Id: macWinMenu.test,v 1.1.4.3 1999/03/24 01:16:55 hershey Exp $
 
 if {$tcl_platform(platform) == "unix"} {
     puts "skipping: Unix only tests..."
@@ -20,7 +20,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -34,11 +34,10 @@ deleteWindows
 wm geometry . {}
 raise .
 
-if {$tcl_platform(platform) == "windows" && ![info exists INTERACTIVE]} {
+if {$tcl_platform(platform) == "windows" && ![info exists tcl_interactive]} {
     puts " Some tests were skipped because they could not be performed"
     puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
+    puts " run them in an tcl_interactive shell."
 }
 
 test macWinMenu-1.1 {PreprocessMenu} {
@@ -47,7 +46,7 @@ test macWinMenu-1.1 {PreprocessMenu} {
     .m1 add command -label "macWinMenu-1.1: Hit Escape"
     list [catch {.m1 post 40 40} msg] $msg
 } {0 {}}
-if {$tcl_platform(platform) != "windows" || [info exists INTERACTIVE]} {
+if {$tcl_platform(platform) != "windows" || [info exists tcl_interactive]} {
     test macWinMenu-1.2 {PreprocessMenu} {
 	catch {destroy .m1}
 	catch {destroy .m2}
@@ -104,7 +103,7 @@ test macWinMenu-1.5 {PreprocessMenu} {
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1 .m2]
 } {1 {invalid command name "glorp"} {}}
 
-if {$tcl_platform(platform) != "windows" || [info exists INTERACTIVE]} {
+if {$tcl_platform(platform) != "windows" || [info exists tcl_interactive]} {
     test macWinMenu-2.1 {TkPreprocessMenu} {
 	catch {destroy .m1}
 	set foo test
@@ -116,5 +115,17 @@ if {$tcl_platform(platform) != "windows" || [info exists INTERACTIVE]} {
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/macscrollbar.test b/tests/macscrollbar.test
index 193dfef..f518888 100644
--- a/tests/macscrollbar.test
+++ b/tests/macscrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macscrollbar.test,v 1.1.4.2 1999/03/11 18:50:58 hershey Exp $
+# RCS: @(#) $Id: macscrollbar.test,v 1.1.4.3 1999/03/24 01:16:56 hershey Exp $
 
 # Only run this test on the Macintosh
 if {$tcl_platform(platform) != "macintosh"} {
@@ -15,7 +15,7 @@ if {$tcl_platform(platform) != "macintosh"} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -102,5 +102,17 @@ foreach i [winfo children .] {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/main.test b/tests/main.test
index db4c2b4..f3527c3 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -8,9 +8,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: main.test,v 1.1.4.4 1999/03/11 18:50:59 hershey Exp $
+# RCS: @(#) $Id: main.test,v 1.1.4.5 1999/03/24 01:16:56 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -21,7 +21,7 @@ test main-1.1 {StdinProc} {unixOnly} {
 	close stdin; exit
     }
     close $fd
-    if {[catch {exec $tktest <script} msg]} {
+    if {[catch {exec $::tcltest::tktest <script} msg]} {
 	set error 1
     } else {
 	set error 0
@@ -32,5 +32,17 @@ test main-1.1 {StdinProc} {unixOnly} {
 
 # cleanup
 catch {removeFile script}
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/menu.test b/tests/menu.test
index 9f56582..55a3844 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: menu.test,v 1.1.4.4 1999/03/11 18:50:59 hershey Exp $
+# RCS: @(#) $Id: menu.test,v 1.1.4.5 1999/03/24 01:16:57 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
@@ -14,20 +14,10 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
-if {$tcl_platform(platform) == "windows" && ![info exists INTERACTIVE]} {
-    puts " Some tests were skipped because they could not be performed"
-    puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
-    set ::test::testConfig(menuInteractive) 0
-} else {
-    set ::test::testConfig(menuInteractive) 1
-}
-
 proc deleteWindows {} {
     foreach i [winfo children .] {
     	catch [destroy $i]
@@ -537,7 +527,7 @@ test menu-3.1 {MenuWidgetCmd procedure} {
     menu .m1
     list [catch {.m1} msg] $msg [destroy .m1]
 } {1 {wrong # args: should be ".m1 option ?arg arg ...?"} {}}
-test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} {menuInteractive} {
+test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1 -postcommand "destroy .m1"
     .m1 add command -label "menu-3.2: Hit Escape"
@@ -808,7 +798,7 @@ test menu-3.49 {MenuWidgetCmd procedure, "post" option} {
     menu .m1
     list [catch {.m1 post 40 bar} msg] $msg [destroy .m1]
 } {1 {expected integer but got "bar"} {}}
-test menu-3.50 {MenuWidgetCmd procedure, "post" option} {menuInteractive} {
+test menu-3.50 {MenuWidgetCmd procedure, "post" option} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "menu-3.53: hit Escape" -command "puts hello"
@@ -824,7 +814,7 @@ test menu-3.52 {MenuWidgetCmd procedure, "postcascade" option} {
     menu .m1
     list [catch {.m1 postcascade foo} msg] $msg [destroy .m1]
 } {1 {bad menu entry index "foo"} {}}
-test menu-3.53 {MenuWidgetCmd procedure, "postcascade" option} {menuInteractive} {
+test menu-3.53 {MenuWidgetCmd procedure, "postcascade" option} {pcOnly interactive} {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1
@@ -893,7 +883,7 @@ test menu-3.63 {MenuWidgetCmd procedure, "unpost" option} {
     menu .m1
     list [catch {.m1 unpost foo} msg] $msg [destroy .m1]
 } {1 {wrong # args: should be ".m1 unpost"} {}}
-test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} {menuInteractive} {
+test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "menu-3.68 - hit Escape"
@@ -2001,13 +1991,13 @@ test menu-18.4 {TkActivateMenuEntry} {
     list [catch {.m1 activate 1} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test menu-19.1 {TkPostCommand} {menuInteractive} {
+test menu-19.1 {TkPostCommand} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1 -postcommand "set menu_test menu-19.1"
     .m1 add command -label "menu-19.1 - hit Escape"
     list [catch {.m1 post 40 40} msg] $msg [.m1 unpost] [set menu_test] [destroy .m1]
 } {0 menu-19.1 {} menu-19.1 {}}
-test menu-19.2 {TkPostCommand} {menuInteractive} {
+test menu-19.2 {TkPostCommand} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "menu-19.2 - hit Escape"
@@ -2444,5 +2434,17 @@ test menu-33.1 {menu vs command hiding} {
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 65b7f55..97a9114 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: menuDraw.test,v 1.1.4.3 1999/03/11 18:51:00 hershey Exp $
+# RCS: @(#) $Id: menuDraw.test,v 1.1.4.4 1999/03/24 01:16:57 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
@@ -14,7 +14,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -28,16 +28,6 @@ deleteWindows
 wm geometry . {}
 raise .
 
-if {$tcl_platform(platform) == "windows" && ![info exists INTERACTIVE]} {
-    puts " Some tests were skipped because they could not be performed"
-    puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
-    set ::test::testConfig(menuInteractive) 0
-} else {
-    set ::test::testConfig(menuInteractive) 1
-}
-
 test menuDraw-1.1 {TkMenuInitializeDrawingFields} {
     catch {destroy .m1}
     list [menu .m1] [destroy .m1]
@@ -190,7 +180,7 @@ test menuDraw-7.2 {TkEventuallyRecomputeMenu - update pending} {
 } {{} {}}
 
 
-test menuDraw-8.1 {TkRecomputeMenu} {menuInteractive} {
+test menuDraw-8.1 {TkRecomputeMenu} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 configure -postcommand [.m1 add command -label foo]
@@ -505,7 +495,7 @@ test menuDraw-16.5 {TkPostSubMenu} {unixOnly} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [catch {$tearoff postcascade test} msg] $msg [destroy .m1] [destroy .m2]
 } {1 {invalid command name "glorp"} {} {}}
-test menuDraw-16.6 {TkPostSubMenu} {menuInteractive} {
+test menuDraw-16.6 {TkPostSubMenu} {pcOnly interactive} {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1
@@ -531,7 +521,7 @@ test menuDraw-17.1 {AdjustMenuCoords - menubar} {unixOnly} {
     }
     list [$w postcascade 0] [. configure -menu ""] [destroy .m1] [destroy .m2]
 } {{} {} {} {}}
-test menuDraw-17.2 {AdjustMenuCoords - menu} {menuInteractive} {
+test menuDraw-17.2 {AdjustMenuCoords - menu} {pcOnly interactive} {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1
@@ -544,5 +534,17 @@ test menuDraw-17.2 {AdjustMenuCoords - menu} {menuInteractive} {
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/menubut.test b/tests/menubut.test
index 326f754..8c9a145 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: menubut.test,v 1.1.4.3 1999/03/11 18:51:01 hershey Exp $
+# RCS: @(#) $Id: menubut.test,v 1.1.4.4 1999/03/24 01:16:58 hershey Exp $
 
 # XXX This test file is woefully incomplete right now.  If any part
 # XXX of a procedure has tests then the whole procedure has tests,
@@ -19,7 +19,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -313,7 +313,7 @@ test menubutton-7.13 {ComputeMenuButtonGeometry procedure} {fonts} {
     pack .mb
     list [winfo reqwidth .mb] [winfo reqheight .mb]
 } {78 28}
-test menubutton-7.14 {ComputeMenuButtonGeometry procedure} {unix nonPortable} {
+test menubutton-7.14 {ComputeMenuButtonGeometry procedure} {unixOnly nonPortable} {
     # The following test is non-portable because the indicator's pixel
     # size varies to maintain constant absolute size.
 
@@ -350,5 +350,17 @@ eval destroy [winfo children .]
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/msgbox.test b/tests/msgbox.test
index 6379ca4..041e1d2 100644
--- a/tests/msgbox.test
+++ b/tests/msgbox.test
@@ -5,10 +5,10 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: msgbox.test,v 1.1.4.4 1999/03/11 18:51:01 hershey Exp $
+# RCS: @(#) $Id: msgbox.test,v 1.1.4.5 1999/03/24 01:16:59 hershey Exp $
 #
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -65,11 +65,10 @@ if {[info commands tkMessageBox] == ""} {
     set isNative 0
 }
 
-if {$isNative && ![info exists INTERACTIVE]} {
+if {$isNative && ![info exists tcl_interactive]} {
     puts " Some tests were skipped because they could not be performed"
     puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test"
+    puts " run them in an tcl_interactive shell."
     return
 }
 
@@ -156,5 +155,17 @@ foreach spec $specs {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/obj.test b/tests/obj.test
index 844652c..87cdd2f 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: obj.test,v 1.1.2.3 1999/03/11 18:51:02 hershey Exp $
+# RCS: @(#) $Id: obj.test,v 1.1.2.4 1999/03/24 01:16:59 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -34,6 +34,18 @@ test obj-4.1 {SetPixelFromAny} {
 eval destroy [winfo children .]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
 
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 2e91731..e5a15b6 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: oldpack.test,v 1.1.4.2 1999/03/11 18:51:02 hershey Exp $
+# RCS: @(#) $Id: oldpack.test,v 1.1.4.3 1999/03/24 01:17:00 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -507,5 +507,17 @@ test pack-9.3 {information output} {
 catch {destroy .pack}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/option.test b/tests/option.test
index 2fe0458..0486f56 100644
--- a/tests/option.test
+++ b/tests/option.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: option.test,v 1.1.4.2 1999/03/11 18:51:03 hershey Exp $
+# RCS: @(#) $Id: option.test,v 1.1.4.3 1999/03/24 01:17:00 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -186,13 +186,13 @@ test option-14.12 {error conditions} {
 } {1 {bad window path name ".gorp.gorp"}}
 
 if {$tcl_platform(os) == "Win32s"} {
-    set option1 [file join $::test::testsDir OPTION~2.FIL]
-    set option2 [file join $::test::testsDir OPTION~1.FIL]
-    set option3 [file join $::test::testsDir OPTION~3.FIL]
+    set option1 [file join $::tcltest::testsDir OPTION~2.FIL]
+    set option2 [file join $::tcltest::testsDir OPTION~1.FIL]
+    set option3 [file join $::tcltest::testsDir OPTION~3.FIL]
 } else {
-    set option1 [file join $::test::testsDir option.file1]
-    set option2 [file join $::test::testsDir option.file2]
-    set option3 [file join $::test::testsDir option.file3]
+    set option1 [file join $::tcltest::testsDir option.file1]
+    set option2 [file join $::tcltest::testsDir option.file2]
+    set option3 [file join $::tcltest::testsDir option.file3]
 }
 
 test option-15.1 {database files} {
@@ -231,5 +231,17 @@ catch {destroy .op1}
 catch {destroy .op2}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/pack.test b/tests/pack.test
index d572443..13e021a 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: pack.test,v 1.1.4.2 1999/03/11 18:51:03 hershey Exp $
+# RCS: @(#) $Id: pack.test,v 1.1.4.3 1999/03/24 01:17:01 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -969,5 +969,17 @@ foreach i {pack1 pack2 pack3 pack4} {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/place.test b/tests/place.test
index ef473c4..f65a56b 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: place.test,v 1.1.4.2 1999/03/11 18:51:04 hershey Exp $
+# RCS: @(#) $Id: place.test,v 1.1.4.3 1999/03/24 01:17:02 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -219,5 +219,17 @@ test place-8.2 {MasterStructureProc, mapping and unmapping slaves} {
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/raise.test b/tests/raise.test
index 74b7b63..8cfcb2a 100644
--- a/tests/raise.test
+++ b/tests/raise.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: raise.test,v 1.1.4.2 1999/03/11 18:51:05 hershey Exp $
+# RCS: @(#) $Id: raise.test,v 1.1.4.3 1999/03/24 01:17:02 hershey Exp $
 
 if {[info commands testmakeexist] == {}} {
     puts "This application hasn't been compiled with the \"testmakeexist\""
@@ -17,7 +17,7 @@ if {[info commands testmakeexist] == {}} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -299,5 +299,17 @@ foreach i [winfo child .] {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/safe.test b/tests/safe.test
index 8efa165..a6a181c 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: safe.test,v 1.1.4.3 1999/03/11 18:51:05 hershey Exp $
+# RCS: @(#) $Id: safe.test,v 1.1.4.4 1999/03/24 01:17:03 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -174,5 +174,17 @@ test safe-7.1 {canvas printing} {
 
 # cleanup
 unset hidden_cmds
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/scale.test b/tests/scale.test
index fb9aa81..e6b85ee 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: scale.test,v 1.1.4.5 1999/03/11 18:51:06 hershey Exp $
+# RCS: @(#) $Id: scale.test,v 1.1.4.6 1999/03/24 01:17:03 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -800,5 +800,17 @@ catch {destroy .s}
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index ce9afba..57c3349 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: scrollbar.test,v 1.1.4.2 1999/03/11 18:51:07 hershey Exp $
+# RCS: @(#) $Id: scrollbar.test,v 1.1.4.3 1999/03/24 01:17:04 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -172,13 +172,13 @@ scrollbar .s2
 test scrollbar-3.11 {ScrollbarWidgetCmd procedure, "cget" option} {pc} {
     list [catch {.s2 cget -bd} msg] $msg
 } {0 0}
-test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} {!pc} {
+test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} {macOrUnix} {
     list [catch {.s2 cget -bd} msg] $msg
 } {0 2}
 test scrollbar-3.13 {ScrollbarWidgetCmd procedure, "cget" option} {pc} {
     list [catch {.s2 cget -highlightthickness} msg] $msg
 } {0 0}
-test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} {!pc} {
+test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} {macOrUnix} {
     list [catch {.s2 cget -highlightthickness} msg] $msg
 } {0 1}
 destroy .s2
@@ -663,5 +663,17 @@ catch {destroy .s}
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/select.test b/tests/select.test
index d0839fa..03cfa12 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -6,14 +6,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: select.test,v 1.1.4.2 1999/03/11 18:51:07 hershey Exp $
+# RCS: @(#) $Id: select.test,v 1.1.4.3 1999/03/24 01:17:05 hershey Exp $
 
 #
 # Note: Multiple display selection handling will only be tested if the
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -448,10 +448,10 @@ test select-5.10 {Tk_GetSelection procedure} {unixOnly} {
     set selInfo ""
     selection own .f1
     set result ""
-    fileevent $::test::fd readable {}
-    puts $::test::fd {catch {selection get TEST} msg; update; puts $msg; flush stdout}
-    flush $::test::fd
-    lappend result [gets $::test::fd]
+    fileevent $::tcltest::fd readable {}
+    puts $::tcltest::fd {catch {selection get TEST} msg; update; puts $msg; flush stdout}
+    flush $::tcltest::fd
+    lappend result [gets $::tcltest::fd]
     cleanupbg
     lappend result $selInfo
 } {{selection owner didn't respond} {}}
@@ -813,14 +813,14 @@ test select-10.1 {ConvertSelection procedure, race with selection clear} {unixOn
     set selInfo ""
     selection handle .f1 {handler STRING}
     update
-    puts $::test::fd {puts "[catch {selection get} msg] $msg"; puts **DONE**; flush stdout}
-    flush $::test::fd
+    puts $::tcltest::fd {puts "[catch {selection get} msg] $msg"; puts **DONE**; flush stdout}
+    flush $::tcltest::fd
     after 200
     selection own .
-    set ::test::bgData {}
-    tkwait variable ::test::bgDone
+    set ::tcltest::bgData {}
+    tkwait variable ::tcltest::bgDone
     cleanupbg
-    list $::test::bgData $selInfo
+    list $::tcltest::bgData $selInfo
 } {{1 PRIMARY selection doesn't exist or form "STRING" not defined} {}}
 test select-10.2 {ConvertSelection procedure} {unixOnly} {
     setup
@@ -985,5 +985,17 @@ test select-13.1 {SelectionSize procedure, handler deleted} {unixOnly} {
 catch {rename weirdHandler {}}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/send.test b/tests/send.test
index b3583e7..0797b38 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: send.test,v 1.1.4.4 1999/03/11 18:51:08 hershey Exp $
+# RCS: @(#) $Id: send.test,v 1.1.4.5 1999/03/24 01:17:05 hershey Exp $
 
 if {$tcl_platform(platform) == "macintosh"} {
     puts "send is not available on the Mac - skipping tests"
@@ -22,7 +22,7 @@ if {[auto_execok xhost] == ""} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 if {[info commands testsend] == "testsend"} {
@@ -579,11 +579,11 @@ test send-12.2 {TimeoutProc procedure} {
     update
     setupbg
     puts $fd {after 10 {after 5000; exit}; puts [tk appname]; puts **DONE**; flush stdout}
-    set ::test::bgDone 0
-    set ::test::bgData {}
+    set ::tcltest::bgDone 0
+    set ::tcltest::bgData {}
     flush $fd
-    tkwait variable ::test::bgDone
-    set app $::test::bgData
+    tkwait variable ::tcltest::bgDone
+    set app $::tcltest::bgData
     after 200
     set result [list [catch {send $app foo} msg] $msg]
     close $fd
@@ -657,5 +657,17 @@ if $gotTestCmds {
 rename newApp {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/text.test b/tests/text.test
index 231c146..16eb0e5 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: text.test,v 1.1.4.3 1999/03/11 18:51:08 hershey Exp $
+# RCS: @(#) $Id: text.test,v 1.1.4.4 1999/03/24 01:17:06 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -1262,5 +1262,17 @@ eval destroy [winfo child .]
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textBTree.test b/tests/textBTree.test
index b38a614..132abc2 100644
--- a/tests/textBTree.test
+++ b/tests/textBTree.test
@@ -8,9 +8,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textBTree.test,v 1.1.4.2 1999/03/11 18:51:09 hershey Exp $
+# RCS: @(#) $Id: textBTree.test,v 1.1.4.3 1999/03/24 01:17:07 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -896,5 +896,17 @@ test btree-18.9 {tag search back, large complex btree spans} {
 destroy .t
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 01201c5..b7f03dd 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,12 +6,12 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textDisp.test,v 1.1.4.3 1999/03/11 18:51:10 hershey Exp $
+# RCS: @(#) $Id: textDisp.test,v 1.1.4.4 1999/03/24 01:17:07 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
-if {$::test::testConfig(fonts) == 0} {
+if {$::tcltest::testConfig(fonts) == 0} {
     puts "skipping font-sensitive tests"
 }
 
@@ -2867,5 +2867,17 @@ foreach i [winfo children .] {
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textImage.test b/tests/textImage.test
index d0d53c7..65862cd 100644
--- a/tests/textImage.test
+++ b/tests/textImage.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textImage.test,v 1.1.4.2 1999/03/11 18:51:11 hershey Exp $
+# RCS: @(#) $Id: textImage.test,v 1.1.4.3 1999/03/24 01:17:08 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -19,7 +19,7 @@ if {[lsearch [namespace children] ::test] == -1} {
 #                       help humans understand what it does.
 # constraints -         A list of one or more keywords, each of
 #                       which must be the name of an element in
-#                       the array "::test::testConfig".  If any of these
+#                       the array "::tcltest::testConfig".  If any of these
 #                       elements is zero, the test is skipped.
 #                       This argument may be omitted.
 # script -              Script to run to carry out the test.  It must
@@ -363,5 +363,17 @@ foreach image [image names] {image delete $image}
 font delete test_font
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textIndex.test b/tests/textIndex.test
index aea75be..0642ce0 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textIndex.test,v 1.1.4.3 1999/03/11 18:51:11 hershey Exp $
+# RCS: @(#) $Id: textIndex.test,v 1.1.4.4 1999/03/24 01:17:09 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -643,5 +643,17 @@ test textIndex-15.15 {StartEnd} {
 # cleanup
 rename textimage {}
 catch {destroy .t}
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textMark.test b/tests/textMark.test
index d9e2bc9..c2ba2ef 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textMark.test,v 1.1.4.3 1999/03/11 18:51:12 hershey Exp $
+# RCS: @(#) $Id: textMark.test,v 1.1.4.4 1999/03/24 01:17:09 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -221,5 +221,17 @@ test textMark-8.8 {MarkFindPrev - no previous mark} {
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textTag.test b/tests/textTag.test
index 0d299c9..f99a926 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textTag.test,v 1.1.4.3 1999/03/11 18:51:12 hershey Exp $
+# RCS: @(#) $Id: textTag.test,v 1.1.4.4 1999/03/24 01:17:10 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -762,5 +762,17 @@ test textTag-16.7 {TkTextPickCurrent procedure} {
 catch {destroy .t}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/textWind.test b/tests/textWind.test
index f6b46e2..2d69a3a 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: textWind.test,v 1.1.4.2 1999/03/11 18:51:13 hershey Exp $
+# RCS: @(#) $Id: textWind.test,v 1.1.4.3 1999/03/24 01:17:10 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -826,5 +826,17 @@ catch {destroy .t}
 option clear
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/tk.test b/tests/tk.test
index 69d3195..c5bf7d3 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: tk.test,v 1.1.4.3 1999/03/11 18:51:14 hershey Exp $
+# RCS: @(#) $Id: tk.test,v 1.1.4.4 1999/03/24 01:17:11 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -79,5 +79,17 @@ test tk-3.11 {tk command: scaling: heightmm} {
 tk scaling $scaling
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixButton.test b/tests/unixButton.test
index 4cf8270..af12b2c 100644
--- a/tests/unixButton.test
+++ b/tests/unixButton.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixButton.test,v 1.1.4.2 1999/03/11 18:51:14 hershey Exp $
+# RCS: @(#) $Id: unixButton.test,v 1.1.4.3 1999/03/24 01:17:12 hershey Exp $
 
 if {$tcl_platform(platform)!="unix"} {
     puts "skipping: Unix only tests..."
@@ -22,7 +22,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -182,5 +182,17 @@ test unixbutton-1.11 {TkpComputeButtonGeometry procedure} {
 eval destroy [winfo children .]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 0ffcbfc..84a7754 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -6,14 +6,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixEmbed.test,v 1.1.4.3 1999/03/11 18:51:15 hershey Exp $
+# RCS: @(#) $Id: unixEmbed.test,v 1.1.4.4 1999/03/24 01:17:12 hershey Exp $
 
 if {$tcl_platform(platform) != "unix"} {
     puts "skipping: Unix only tests..."
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -626,5 +626,17 @@ foreach w [winfo child .] {
     catch {destroy $w}
 }
 cleanupbg
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixFont.test b/tests/unixFont.test
index fd85fe3..5ea1341 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -12,14 +12,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixFont.test,v 1.1.4.3 1999/03/11 18:51:16 hershey Exp $
+# RCS: @(#) $Id: unixFont.test,v 1.1.4.4 1999/03/24 01:17:13 hershey Exp $
 
 if {$tcl_platform(platform)!="unix"} {
     puts "skipping: Unix only tests..."
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -292,5 +292,17 @@ test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {
 } {0 1 1 1 1 2}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixMenu.test b/tests/unixMenu.test
index 354f19a..b393e81 100644
--- a/tests/unixMenu.test
+++ b/tests/unixMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixMenu.test,v 1.1.4.3 1999/03/11 18:51:16 hershey Exp $
+# RCS: @(#) $Id: unixMenu.test,v 1.1.4.4 1999/03/24 01:17:13 hershey Exp $
 
 if {$tcl_platform(platform) != "unix"} {
     puts "skipping: Unix only tests..."
@@ -21,7 +21,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -968,5 +968,17 @@ test unixMenu-26.1 {TkpMenuInit - nothing to do} {} {}
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixSend.test b/tests/unixSend.test
index aa140d2..a747fef 100644
--- a/tests/unixSend.test
+++ b/tests/unixSend.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixSend.test,v 1.1.2.3 1999/03/11 18:51:17 hershey Exp $
+# RCS: @(#) $Id: unixSend.test,v 1.1.2.4 1999/03/24 01:17:14 hershey Exp $
 
 if {$tcl_platform(platform) == "macintosh"} {
     puts "send is not available on the Mac - skipping tests"
@@ -22,7 +22,7 @@ if {[auto_execok xhost] == ""} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -580,11 +580,11 @@ test unixSend-12.2 {TimeoutProc procedure} {
     update
     setupbg
     puts $fd {after 10 {after 5000; exit}; puts [tk appname]; puts **DONE**; flush stdout}
-    set ::test::bgDone 0
-    set ::test::bgData {}
+    set ::tcltest::bgDone 0
+    set ::tcltest::bgData {}
     flush $fd
-    tkwait variable ::test::bgDone
-    set app $::test::bgData
+    tkwait variable ::tcltest::bgDone
+    set app $::tcltest::bgData
     after 200
     set result [list [catch {send $app foo} msg] $msg]
     close $fd
@@ -658,5 +658,17 @@ if $gotTestCmds {
 rename newApp {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 8f3c438..8be018a 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -7,14 +7,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixWm.test,v 1.1.4.5 1999/03/11 23:51:27 hershey Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.1.4.6 1999/03/24 01:17:15 hershey Exp $
 
 if {$tcl_platform(platform) != "unix"} {
     puts "skipping: Unix only tests..."
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -2332,7 +2332,7 @@ test unixWm-58.1 {exit processing} {
 	exit
     }
     close $fd
-    if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} {
+    if {[catch {exec $::tcltest::tktest script -geometry 10x10+0+0} msg]} {
 	set error 1
     } else {
 	set error 0
@@ -2351,7 +2351,7 @@ test unixWm-58.2 {exit processing} {
 	exit
     }
     close $fd
-    if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} {
+    if {[catch {exec $::tcltest::tktest script -geometry 10x10+0+0} msg]} {
 	set error 1
     } else {
 	set error 0
@@ -2376,7 +2376,7 @@ test unixWm-58.3 {exit processing} {
 	exit
     }
     close $fd
-    if {[catch {exec $::test::tktest script -geometry 10x10+0+0} msg]} {
+    if {[catch {exec $::tcltest::tktest script -geometry 10x10+0+0} msg]} {
 	set error 1
     } else {
 	set error 0
@@ -2387,5 +2387,17 @@ test unixWm-58.3 {exit processing} {
 # cleanup
 catch {destroy .t}
 catch {removeFile script}
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/util.test b/tests/util.test
index 9efc917..60c1d44 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: util.test,v 1.1.4.2 1999/03/11 18:51:18 hershey Exp $
+# RCS: @(#) $Id: util.test,v 1.1.4.3 1999/03/24 01:17:15 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -70,5 +70,17 @@ test util-1.12 {Tk_GetScrollInfo procedure} {
 } {1 {unknown option "dropdead": must be moveto or scroll}}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/visual.test b/tests/visual.test
index 4f02600..19c4896 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -7,9 +7,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: visual.test,v 1.1.4.2 1999/03/11 18:51:19 hershey Exp $
+# RCS: @(#) $Id: visual.test,v 1.1.4.3 1999/03/24 01:17:16 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -311,5 +311,17 @@ rename eatColors {}
 rename colorsFree {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winButton.test b/tests/winButton.test
index 1baba5f..d073b25 100644
--- a/tests/winButton.test
+++ b/tests/winButton.test
@@ -8,12 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winButton.test,v 1.1.4.2 1999/03/11 18:51:20 hershey Exp $
-
-if {$tcl_platform(platform)!="windows"} {
-    puts "skipping: Windows only tests..."
-    return
-}
+# RCS: @(#) $Id: winButton.test,v 1.1.4.3 1999/03/24 01:17:16 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\""
@@ -22,7 +17,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -47,7 +42,7 @@ radiobutton .r -text Radiobutton
 pack .l .b .c .r
 update
 
-test winbutton-1.1 {TkpComputeButtonGeometry procedure} {
+test winbutton-1.1 {TkpComputeButtonGeometry procedure} {pcOnly} {
     eval destroy [winfo children .]
     image create test image1
     image1 changed 0 0 0 0 60 40
@@ -62,7 +57,7 @@ test winbutton-1.1 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {68 48 71 51 96 50 96 50}
-test winbutton-1.2 {TkpComputeButtonGeometry procedure} {
+test winbutton-1.2 {TkpComputeButtonGeometry procedure} {pcOnly} {
     eval destroy [winfo children .]
     label .b1 -bitmap question -bd 3 -padx 0 -pady 2
     button .b2 -bitmap question -bd 3 -padx 0 -pady 2
@@ -75,7 +70,7 @@ test winbutton-1.2 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {23 33 26 36 51 35 51 35}
-test winbutton-1.3 {TkpComputeButtonGeometry procedure} {
+test winbutton-1.3 {TkpComputeButtonGeometry procedure} {pcOnly} {
     eval destroy [winfo children .]
     label .b1 -bitmap question -bd 3 -highlightthickness 4
     button .b2 -bitmap question -bd 3 -highlightthickness 0
@@ -89,7 +84,7 @@ test winbutton-1.3 {TkpComputeButtonGeometry procedure} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {31 41 24 34 26 36 26 36}
-test winbutton-1.4 {TkpComputeButtonGeometry procedure} {nonPortable} {
+test winbutton-1.4 {TkpComputeButtonGeometry procedure} {pcOnly nonPortable} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -font {{MS Sans Serif} 8}
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 -font {{MS Sans Serif} 8}
@@ -102,21 +97,21 @@ test winbutton-1.4 {TkpComputeButtonGeometry procedure} {nonPortable} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {58 24 67 33 88 30 90 28} 
-test winbutton-1.5 {TkpComputeButtonGeometry procedure} {nonPortable} {
+test winbutton-1.5 {TkpComputeButtonGeometry procedure} {pcOnly nonPortable} {
     eval destroy [winfo children .]
     label .l1 -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)." -wraplength 1.5i -padx 0 -pady 0
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
 } {178 84}
-test winbutton-1.6 {TkpComputeButtonGeometry procedure} {nonPortable} {
+test winbutton-1.6 {TkpComputeButtonGeometry procedure} {pcOnly nonPortable} {
     eval destroy [winfo children .]
     label .l1 -text "This is a long string without wrapping.\n\nIt also has a blank line (above)." -padx 0 -pady 0
     pack .l1
     update
     list [winfo reqwidth .l1] [winfo reqheight .l1]
 } {222 52}
-test winbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable} {
+test winbutton-1.7 {TkpComputeButtonGeometry procedure} {pcOnly nonPortable} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -width 10
     button .b2 -text Xagqpim -bd 2 -padx 0 -pady 2 -height 5
@@ -129,7 +124,7 @@ test winbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {74 24 67 97 174 46 64 28}
-test winbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable} {
+test winbutton-1.8 {TkpComputeButtonGeometry procedure} {pcOnly nonPortable} {
     eval destroy [winfo children .]
     label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 \
 	-highlightthickness 4
@@ -145,7 +140,7 @@ test winbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable} {
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
 } {66 32 65 31 69 31 71 29}
-test winbutton-1.9 {TkpComputeButtonGeometry procedure} {
+test winbutton-1.9 {TkpComputeButtonGeometry procedure} {pcOnly} {
     eval destroy [winfo children .]
     button .b2 -bitmap question -default normal
     list [winfo reqwidth .b2] [winfo reqheight .b2]
@@ -153,5 +148,17 @@ test winbutton-1.9 {TkpComputeButtonGeometry procedure} {
 
 # cleanup
 eval destroy [winfo children .]
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winClipboard.test b/tests/winClipboard.test
index ed16d0c..39eecc0 100644
--- a/tests/winClipboard.test
+++ b/tests/winClipboard.test
@@ -10,41 +10,48 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winClipboard.test,v 1.1.4.3 1999/03/11 18:51:20 hershey Exp $
+# RCS: @(#) $Id: winClipboard.test,v 1.1.4.4 1999/03/24 01:17:17 hershey Exp $
 
-if {$tcl_platform(platform)!="windows"} {
-    puts "skipping: Windows only tests..."
-    return
-}
-
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
 # Note that these tests may fail if another application is grabbing the
 # clipboard (e.g. an X server)
 
-test winClipboard-1.1 {TkSelGetSelection} {
+test winClipboard-1.1 {TkSelGetSelection} {pcOnly} {
     clipboard clear
     catch {selection get -selection CLIPBOARD} msg
     set msg
 } {CLIPBOARD selection doesn't exist or form "STRING" not defined}
-test winClipboard-1.2 {TkSelGetSelection} {
+test winClipboard-1.2 {TkSelGetSelection} {pcOnly} {
     clipboard clear
     clipboard append {}
     list [selection get -selection CLIPBOARD] [testclipboard]
 } {{} {}}
-test winClipboard-1.3 {TkSelGetSelection & TkWinClipboardRender} {
+test winClipboard-1.3 {TkSelGetSelection & TkWinClipboardRender} {pcOnly} {
     clipboard clear
     clipboard append abcd
     list [selection get -selection CLIPBOARD] [testclipboard]
 } {abcd abcd}
-test winClipboard-1.4 {TkSelGetSelection & TkWinClipboardRender} {
+test winClipboard-1.4 {TkSelGetSelection & TkWinClipboardRender} {pcOnly} {
     clipboard clear
     clipboard append "line 1\nline 2"
     list [selection get -selection CLIPBOARD] [testclipboard]
 } [list "line 1\nline 2" "line 1\r\nline 2"]
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winDialog.test b/tests/winDialog.test
index 60c043f..b957766 100644
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -6,19 +6,17 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winDialog.test,v 1.1.2.4 1999/03/14 01:22:53 hershey Exp $
+# RCS: @(#) $Id: winDialog.test,v 1.1.2.5 1999/03/24 01:17:18 hershey Exp $
 
-if {$tcl_platform(os) != "Windows NT"} {
-    puts "skipping: Windows NT only tests..."
-    return 
+if {[info command testwinevent] == ""} {
+    puts "skipping: tests require the testwinevent command"
+    return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
-set ::test::testConfig(interactive)	[info exists INTERACTIVE]
-
 testwinevent debug 1
 
 eval destroy [winfo children .] 
@@ -61,13 +59,13 @@ proc SetText {button text} {
     return [testwinevent $::tk_dialog $button WM_SETTEXT $text]
 }
 
-test winDialog-1.1 {Tk_ChooseColorObjCmd} {
+test winDialog-1.1 {Tk_ChooseColorObjCmd} {nt} {
 } {}
 
-test winDialog-2.1 {ColorDlgHookProc} {
+test winDialog-2.1 {ColorDlgHookProc} {nt} {
 } {}
 
-test winDialog-3.1 {Tk_GetOpenFileObjCmd} {
+test winDialog-3.1 {Tk_GetOpenFileObjCmd} {nt} {
     start {tk_getOpenFile}
     then {
 	set x [GetText 2]
@@ -76,7 +74,7 @@ test winDialog-3.1 {Tk_GetOpenFileObjCmd} {
     set x	
 } {Cancel}
 
-test winDialog-4.1 {Tk_GetSaveFileObjCmd} {
+test winDialog-4.1 {Tk_GetSaveFileObjCmd} {nt} {
     start {tk_getSaveFile}
     then {
 	set x [GetText 2]
@@ -85,34 +83,34 @@ test winDialog-4.1 {Tk_GetSaveFileObjCmd} {
     set x	
 } {Cancel}
 
-test winDialog-5.1 {GetFileName: no arguments} {
+test winDialog-5.1 {GetFileName: no arguments} {nt} {
     start {tk_getOpenFile -title Open}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.2 {GetFileName: one argument} {
+test winDialog-5.2 {GetFileName: one argument} {nt} {
     list [catch {tk_getOpenFile -foo} msg] $msg
 } {1 {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -parent, or -title}}
-test winDialog-5.4 {GetFileName: many arguments} {
+test winDialog-5.4 {GetFileName: many arguments} {nt} {
     start {tk_getOpenFile -initialdir c:/ -parent . -title test -initialfile foo}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() != TCL_OK} {
+test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() != TCL_OK} {nt} {
     list [catch {tk_getOpenFile -foo bar -abc} msg] $msg
 } {1 {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -parent, or -title}}
-test winDialog-5.6 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} {
+test winDialog-5.6 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} {nt} {
     start {tk_getOpenFile -title bar}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.7 {GetFileName: valid option, but missing value} {
+test winDialog-5.7 {GetFileName: valid option, but missing value} {nt} {
     list [catch {tk_getOpenFile -initialdir bar -title} msg] $msg
 } {1 {value for "-title" missing}}
-test winDialog-5.8 {GetFileName: extension begins with .} {
+test winDialog-5.8 {GetFileName: extension begins with .} {nt} {
 #    if (string[0] == '.') {
 #	string++;
 #    }
@@ -124,7 +122,7 @@ test winDialog-5.8 {GetFileName: extension begins with .} {
     }
     set x
 } [file join [pwd] bar.foo]
-test winDialog-5.9 {GetFileName: extension doesn't begin with .} {
+test winDialog-5.9 {GetFileName: extension doesn't begin with .} {nt} {
     start {set x [tk_getSaveFile -defaultextension foo -title Save]}
     then {
 	SetText 0x480 bar
@@ -132,7 +130,7 @@ test winDialog-5.9 {GetFileName: extension doesn't begin with .} {
     }
     set x
 } [file join [pwd] bar.foo]
-test winDialog-5.10 {GetFileName: file types} {
+test winDialog-5.10 {GetFileName: file types} {nt} {
 #	    case FILE_TYPES: 
 
     start {tk_getSaveFile -filetypes {{"foo files" .foo FOOF}} -title Foo}
@@ -142,12 +140,12 @@ test winDialog-5.10 {GetFileName: file types} {
     }
     set x
 } {foo files (*.foo)}
-test winDialog-5.11 {GetFileName: file types: MakeFilter() fails} {
+test winDialog-5.11 {GetFileName: file types: MakeFilter() fails} {nt} {
 #		if (MakeFilter(interp, string, &utfFilterString) != TCL_OK) 
 
     list [catch {tk_getSaveFile -filetypes {{"foo" .foo FOO}}} msg] $msg
 } {1 {bad Macintosh file type "FOO"}}
-test winDialog-5.12 {GetFileName: initial directory} {
+test winDialog-5.12 {GetFileName: initial directory} {nt} {
 #	    case FILE_INITDIR: 
 
     start {set x [tk_getSaveFile -initialdir c:/ -initialfile "12x 455" -title Foo]}
@@ -156,12 +154,13 @@ test winDialog-5.12 {GetFileName: initial directory} {
     }
     set x
 } {C:/12x 455}
-test winDialog-5.13 {GetFileName: initial directory: Tcl_TranslateFilename()} {
+test winDialog-5.13 {GetFileName: initial directory: Tcl_TranslateFilename()} \
+	{nt} {
 #		if (Tcl_TranslateFileName(interp, string, &ds) == NULL) 
     
     list [catch {tk_getOpenFile -initialdir ~12x/455} msg] $msg
 } {1 {user "12x" doesn't exist}}
-test winDialog-5.14 {GetFileName: initial file} {
+test winDialog-5.14 {GetFileName: initial file} {nt} {
 #	    case FILE_INITFILE: 
 
     start {set x [tk_getSaveFile -initialfile "12x 456" -title Foo]}
@@ -170,7 +169,7 @@ test winDialog-5.14 {GetFileName: initial file} {
     }
     set x
 } [file join [pwd] "12x 456"]
-test winDialog-5.15 {GetFileName: initial file: Tcl_TranslateFileName()} {
+test winDialog-5.15 {GetFileName: initial file: Tcl_TranslateFileName()} {nt} {
 #		if (Tcl_TranslateFileName(interp, string, &ds) == NULL) 
     list [catch {tk_getOpenFile -initialfile ~12x/455} msg] $msg
 } {1 {user "12x" doesn't exist}}
@@ -179,14 +178,14 @@ append a $a
 append a $a
 append a $a
 append a $a
-test winDialog-5.16 {GetFileName: initial file: long name} {knownBug} {
+test winDialog-5.16 {GetFileName: initial file: long name} {knownBug nt} {
     start {set x [tk_getSaveFile -initialfile $a -title Long]}
     then {
 	Click 1
     }
     set x
 } [string range [file join [pwd] $a] 0 257]
-test winDialog-5.17 {GetFileName: parent} {
+test winDialog-5.17 {GetFileName: parent} {nt} {
 #	    case FILE_PARENT: 
 
     toplevel .t
@@ -197,7 +196,7 @@ test winDialog-5.17 {GetFileName: parent} {
     }
     set x
 } {1}
-test winDialog-5.18 {GetFileName: title} {
+test winDialog-5.18 {GetFileName: title} {nt} {
 #	    case FILE_TITLE: 
     
     start {tk_getOpenFile -title Narf}
@@ -205,7 +204,7 @@ test winDialog-5.18 {GetFileName: title} {
 	Click 2
     }
 } {0}
-test winDialog-5.19 {GetFileName: no filter specified} {
+test winDialog-5.19 {GetFileName: no filter specified} {nt} {
 #    if (ofn.lpstrFilter == NULL) 
 
     start {tk_getOpenFile -title Filter} 
@@ -215,7 +214,7 @@ test winDialog-5.19 {GetFileName: no filter specified} {
     }
     set x
 } {All Files (*.*)}
-test winDialog-5.20 {GetFileName: parent HWND doesn't yet exist} {
+test winDialog-5.20 {GetFileName: parent HWND doesn't yet exist} {nt} {
 #    if (Tk_WindowId(parent) == None) 
 
     toplevel .t
@@ -224,7 +223,7 @@ test winDialog-5.20 {GetFileName: parent HWND doesn't yet exist} {
 	destroy .t
     }
 } {}
-test winDialog-5.21 {GetFileName: parent HWND already exists} {
+test winDialog-5.21 {GetFileName: parent HWND already exists} {nt} {
     toplevel .t
     update
     start {tk_getOpenFile -parent .t -title Open}
@@ -232,7 +231,7 @@ test winDialog-5.21 {GetFileName: parent HWND already exists} {
 	destroy .t
     }
 } {}
-test winDialog-5.22 {GetFileName: call GetOpenFileName} {
+test winDialog-5.22 {GetFileName: call GetOpenFileName} {nt} {
 #	    winCode = GetOpenFileName(&ofn);
     
     start {tk_getOpenFile -title Open}
@@ -242,7 +241,7 @@ test winDialog-5.22 {GetFileName: call GetOpenFileName} {
     }
     set x
 } {&Open}
-test winDialog-5.22 {GetFileName: call GetSaveFileName} {
+test winDialog-5.22 {GetFileName: call GetSaveFileName} {nt} {
 #	    winCode = GetSaveFileName(&ofn);
 
     start {tk_getSaveFile -title Save}
@@ -252,7 +251,7 @@ test winDialog-5.22 {GetFileName: call GetSaveFileName} {
     }
     set x
 } {&Save}
-test winDialog-5.22 {GetFileName: convert \ to /} {
+test winDialog-5.22 {GetFileName: convert \ to /} {nt} {
     start {set x [tk_getSaveFile -title Back]}
     then {
 	SetText 0x480 "c:\\12x 457"
@@ -261,40 +260,43 @@ test winDialog-5.22 {GetFileName: convert \ to /} {
     set x
 } {c:/12x 457}
 
-test winDialog-8.1 {OFNHookProc} {
+test winDialog-8.1 {OFNHookProc} {nt} {
 } {}
 
-test winDialog-6.1 {MakeFilter} {
+test winDialog-6.1 {MakeFilter} {nt} {
 } {}
 
-test winDialog-5.1 {Tk_ChooseDirectoryObjCmd: no arguments} {
+test winDialog-5.1 {Tk_ChooseDirectoryObjCmd: no arguments} {nt} {
     start {tk_chooseDirectory}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.2 {Tk_ChooseDirectoryObjCmd: one argument} {
+test winDialog-5.2 {Tk_ChooseDirectoryObjCmd: one argument} {nt} {
     list [catch {tk_chooseDirectory -foo} msg] $msg
 } {1 {bad option "-foo": must be -initialdir, -mustexist, -parent, or -title}}
-test winDialog-5.4 {Tk_ChooseDirectoryObjCmd: many arguments} {
+test winDialog-5.4 {Tk_ChooseDirectoryObjCmd: many arguments} {nt} {
     start {tk_chooseDirectory -initialdir c:/ -mustexist 1 -parent . -title test}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.5 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() != TCL_OK} {
+test winDialog-5.5 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() != TCL_OK} \
+	{nt} {
     list [catch {tk_chooseDirectory -foo bar -abc} msg] $msg
 } {1 {bad option "-foo": must be -initialdir, -mustexist, -parent, or -title}}
-test winDialog-5.6 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() == TCL_OK} {
+test winDialog-5.6 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() == TCL_OK} \
+	{nt} {
     start {tk_chooseDirectory -title bar}
     then {
 	Click cancel
     }
 } {0}
-test winDialog-5.7 {Tk_ChooseDirectoryObjCmd: valid option, but missing value} {
+test winDialog-5.7 {Tk_ChooseDirectoryObjCmd: valid option, but missing value} \
+	{nt} {
     list [catch {tk_chooseDirectory -initialdir bar -title} msg] $msg
 } {1 {value for "-title" missing}}
-test winDialog-5.12 {Tk_ChooseDirectoryObjCmd: initial directory} {
+test winDialog-5.12 {Tk_ChooseDirectoryObjCmd: initial directory} {nt} {
 #	    case DIR_INITIAL: 
 
     start {set x [tk_chooseDirectory -initialdir c:/ -title Foo]}
@@ -303,18 +305,29 @@ test winDialog-5.12 {Tk_ChooseDirectoryObjCmd: initial directory} {
     }
     string tolower [set x]
 } {c:/}
-test winDialog-5.13 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFilename()} {
+test winDialog-5.13 \
+	{Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFilename()} \
+	{nt} {
 #		if (Tcl_TranslateFileName(interp, string, 
 #			&utfDirString) == NULL) 
     
     list [catch {tk_chooseDirectory -initialdir ~12x/455} msg] $msg
 } {1 {user "12x" doesn't exist}}
 
-test winDialog-7.1 {Tk_MessageBoxObjCmd} {
-} {}
+test winDialog-7.1 {Tk_MessageBoxObjCmd} {emptyTest nt} {} {}
 
 testwinevent debug 0
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winFont.test b/tests/winFont.test
index 910b86c..fbcf23d 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -10,14 +10,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winFont.test,v 1.1.4.2 1999/03/11 18:51:21 hershey Exp $
+# RCS: @(#) $Id: winFont.test,v 1.1.4.3 1999/03/24 01:17:18 hershey Exp $
 
-if {$tcl_platform(platform)!="windows"} {
-    puts "skipping: Windows only tests..."
-    return
-}
-
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -45,10 +40,10 @@ proc getsize {} {
     return "[winfo reqwidth .b.l] [winfo reqheight .b.l]"
 }
 
-test winfont-1.1 {TkpGetNativeFont procedure: not native} {
+test winfont-1.1 {TkpGetNativeFont procedure: not native} {pcOnly} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
-test winfont-1.2 {TkpGetNativeFont procedure: native} {
+test winfont-1.2 {TkpGetNativeFont procedure: native} {pcOnly} {
     font measure ansifixed 0
     font measure ansi 0
     font measure device 0
@@ -58,98 +53,99 @@ test winfont-1.2 {TkpGetNativeFont procedure: native} {
     set x {}
 } {}
 
-test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} {
+test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} {pcOnly} {
     expr [font actual {-size -10} -size]>0
 } {1}
-test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} {
+test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} {pcOnly} {
     expr [font actual {-family Arial} -size]>0
 } {1}
-test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} {
+test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} {pcOnly} {
     font actual {-weight normal} -weight
 } {normal}
-test winfont-2.4 {TkpGetFontFromAttributes procedure: bold weight} {
+test winfont-2.4 {TkpGetFontFromAttributes procedure: bold weight} {pcOnly} {
     font actual {-weight bold} -weight
 } {bold}
-test winfont-2.5 {TkpGetFontFromAttributes procedure: no family} {
+test winfont-2.5 {TkpGetFontFromAttributes procedure: no family} {pcOnly} {
     catch {expr {[font actual {-size 10} -size]}}
 } 0
-test winfont-2.6 {TkpGetFontFromAttributes procedure: family} {
+test winfont-2.6 {TkpGetFontFromAttributes procedure: family} {pcOnly} {
     font actual {-family Arial} -family
 } {Arial}
-test winfont-2.7 {TkpGetFontFromAttributes procedure: Times fonts} {
+test winfont-2.7 {TkpGetFontFromAttributes procedure: Times fonts} {pcOnly} {
     set x {}
     lappend x [font actual {-family "Times"} -family]
     lappend x [font actual {-family "New York"} -family]
     lappend x [font actual {-family "Times New Roman"} -family]
 } {{Times New Roman} {Times New Roman} {Times New Roman}}
-test winfont-2.8 {TkpGetFontFromAttributes procedure: Courier fonts} {
+test winfont-2.8 {TkpGetFontFromAttributes procedure: Courier fonts} {pcOnly} {
     set x {}
     lappend x [font actual {-family "Courier"} -family]
     lappend x [font actual {-family "Monaco"} -family]
     lappend x [font actual {-family "Courier New"} -family]
 } {{Courier New} {Courier New} {Courier New}}
-test winfont-2.9 {TkpGetFontFromAttributes procedure: Helvetica fonts} {
+test winfont-2.9 {TkpGetFontFromAttributes procedure: Helvetica fonts} {pcOnly} {
     set x {}
     lappend x [font actual {-family "Helvetica"} -family]
     lappend x [font actual {-family "Geneva"} -family]
     lappend x [font actual {-family "Arial"} -family]
 } {Arial Arial Arial}
-test winfont-2.10 {TkpGetFontFromAttributes procedure: fallback} {
+test winfont-2.10 {TkpGetFontFromAttributes procedure: fallback} {pcOnly} {
     # No way to get it to fail! Any font name is acceptable.
 } {}
 
-test winfont-3.1 {TkpDeleteFont procedure} {
+test winfont-3.1 {TkpDeleteFont procedure} {pcOnly} {
     font actual {-family xyz}
     set x {}
 } {}
 
-test winfont-4.1 {TkpGetFontFamilies procedure} {
+test winfont-4.1 {TkpGetFontFamilies procedure} {pcOnly} {
     font families
     set x {}
 } {}
 
-test winfont-5.1 {Tk_MeasureChars procedure: unbounded right margin} {
+test winfont-5.1 {Tk_MeasureChars procedure: unbounded right margin} {pcOnly} {
     .b.l config -wrap 0 -text "000000"
     getsize
 } "[expr $ax*6] $ay"
-test winfont-5.2 {Tk_MeasureChars procedure: static width buffer exceeded} {
+test winfont-5.2 {Tk_MeasureChars procedure: static width buffer exceeded} {pcOnly} {
     .b.l config -wrap 100000 -text "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     getsize
 } "[expr $ax*256] $ay"
-test winfont-5.3 {Tk_MeasureChars procedure: all chars did fit} {
+test winfont-5.3 {Tk_MeasureChars procedure: all chars did fit} {pcOnly} {
     .b.l config -wrap [expr $ax*10] -text "00000000"
     getsize
 } "[expr $ax*8] $ay"
-test winfont-5.4 {Tk_MeasureChars procedure: not all chars fit} {
+test winfont-5.4 {Tk_MeasureChars procedure: not all chars fit} {pcOnly} {
     .b.l config -wrap [expr $ax*6] -text "00000000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} {
+test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} {pcOnly} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($cx*2.5)],1
 } {2}
-test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} { 
+test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} {pcOnly} { 
     .b.l config -text "000000" -wrap 1
     getsize
 } "$ax [expr $ay*6]"
-test winfont-5.7 {Tk_MeasureChars procedure: whole words} {
+test winfont-5.7 {Tk_MeasureChars procedure: whole words} {pcOnly} {
     .b.l config -wrap [expr $ax*8] -text "000000 0000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test winfont-5.8 {Tk_MeasureChars procedure: already saw space in line} {
+test winfont-5.8 {Tk_MeasureChars procedure: already saw space in line} {pcOnly} {
     .b.l config -wrap [expr $ax*12] -text "000000    0000000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test winfont-5.9 {Tk_MeasureChars procedure: internal spaces significant} {
+test winfont-5.9 {Tk_MeasureChars procedure: internal spaces significant} {pcOnly} {
     .b.l config -wrap [expr $ax*12] -text "000  00   00000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test winfont-5.10 {Tk_MeasureChars procedure: make first part of word fit} {
+test winfont-5.10 {Tk_MeasureChars procedure: make first part of word fit} {pcOnly} {
     .b.l config -wrap [expr $ax*12] -text "0000000000000000"
     getsize
 } "[expr $ax*12] [expr $ay*2]"
-test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} {nonPortable} {
+test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} \
+	{pcOnly nonPortable} {
     set font [.b.l cget -font]
     .b.l config -font {{MS Sans Serif} 8} -text "W"
     set width [winfo reqwidth .b.l]
@@ -158,12 +154,12 @@ test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} {nonPortable} {
     .b.l config -font $font
     expr $x < ($width*10)
 } 1
-test winfont-6.1 {Tk_DrawChars procedure: loop test} {
+test winfont-6.1 {Tk_DrawChars procedure: loop test} {pcOnly} {
     .b.l config -text "a"
     update
 } {}
 
-test winfont-7.1 {AllocFont procedure: use old font} {
+test winfont-7.1 {AllocFont procedure: use old font} {pcOnly} {
     font create xyz
     catch {destroy .c}
     button .c -font xyz
@@ -172,17 +168,28 @@ test winfont-7.1 {AllocFont procedure: use old font} {
     destroy .c
     font delete xyz
 } {}
-test winfont-7.2 {AllocFont procedure: extract info from logfont} {
+test winfont-7.2 {AllocFont procedure: extract info from logfont} {pcOnly} {
     font actual {arial 10 bold italic underline overstrike}
 } {-family Arial -size 10 -weight bold -slant italic -underline 1 -overstrike 1}
-test winfont-7.3 {AllocFont procedure: extract info from textmetric} {
+test winfont-7.3 {AllocFont procedure: extract info from textmetric} {pcOnly} {
     font metric {arial 10 bold italic underline overstrike} -fixed
 } {0}
-test winfont-7.4 {AllocFont procedure: extract info from textmetric} {
+test winfont-7.4 {AllocFont procedure: extract info from textmetric} {pcOnly} {
     font metric systemfixed -fixed
 } {1}
 
 # cleanup
 destroy .b
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winMenu.test b/tests/winMenu.test
index 800fb4f..8d5d7fa 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -7,22 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winMenu.test,v 1.1.4.3 1999/03/11 18:51:22 hershey Exp $
-
-if {$tcl_platform(platform) != "windows"} {
-    puts "skipping: Windows only tests..."
-    return
-}
-
-if {![info exists INTERACTIVE]} {
-    puts " Some tests were skipped because they could not be performed"
-    puts " automatically on this platform. If you wish to execute them"
-    puts " interactively, set the TCL variable INTERACTIVE and re-run"
-    puts " the test."
-    set ::test::testConfig(menuInteractive) 0
-} else {
-    set ::test::testConfig(menuInteractive) 1
-}
+# RCS: @(#) $Id: winMenu.test,v 1.1.4.4 1999/03/24 01:17:19 hershey Exp $
 
 if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
@@ -31,7 +16,7 @@ if {[lsearch [image types] test] < 0} {
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -45,23 +30,23 @@ deleteWindows
 wm geometry . {}
 raise .
 
-test winMenu-1.1 {GetNewID} {
+test winMenu-1.1 {GetNewID} {pcOnly} {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [destroy .m1]
 } {0 .m1 {}}
 # Basically impossible to test menu IDs wrapping.
 
-test winMenu-2.1 {FreeID} {
+test winMenu-2.1 {FreeID} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {destroy .m1} msg] $msg
 } {0 {}}
 
-test winMenu-3.1 {TkpNewMenu} {
+test winMenu-3.1 {TkpNewMenu} {pcOnly} {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [catch {destroy .m1} msg2] $msg2
 } {0 .m1 0 {}}
-test winMenu-3.2 {TkpNewMenu} {
+test winMenu-3.2 {TkpNewMenu} {pcOnly} {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -69,12 +54,12 @@ test winMenu-3.2 {TkpNewMenu} {
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [catch {destroy .m1} msg2] $msg2
 } {0 {} {} 0 {}}
 
-test winMenu-4.1 {TkpDestroyMenu} {
+test winMenu-4.1 {TkpDestroyMenu} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {destroy .m1} msg] $msg
 } {0 {}}
-test winMenu-4.2 {TkpDestroyMenu - help menu} {
+test winMenu-4.2 {TkpDestroyMenu - help menu} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -menu .m1.system
@@ -82,7 +67,7 @@ test winMenu-4.2 {TkpDestroyMenu - help menu} {
     list [catch {destroy .m1.system} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 
-test winMenu-5.1 {TkpDestroyMenuEntry} {
+test winMenu-5.1 {TkpDestroyMenuEntry} {pcOnly} {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -91,89 +76,89 @@ test winMenu-5.1 {TkpDestroyMenuEntry} {
     list [catch {.m1 delete 1} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-6.1 {GetEntryText} {
+test winMenu-6.1 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [destroy .m1]
 } {0 .m1 {}}
-test winMenu-6.2 {GetEntryText} {
+test winMenu-6.2 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
     image create test image1
     list [catch {.m1 add command -image image1} msg] $msg [destroy .m1] [image delete image1]
 } {0 {} {} {}}
-test winMenu-6.3 {GetEntryText} {
+test winMenu-6.3 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -bitmap questhead} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.4 {GetEntryText} {
+test winMenu-6.4 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.5 {GetEntryText} {
+test winMenu-6.5 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.6 {GetEntryText} {
+test winMenu-6.6 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.7 {GetEntryText} {
+test winMenu-6.7 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.8 {GetEntryText} {
+test winMenu-6.8 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.9 {GetEntryText} {
+test winMenu-6.9 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo" -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.10 {GetEntryText} {
+test winMenu-6.10 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it" -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.11 {GetEntryText} {
+test winMenu-6.11 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4 -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.12 {GetEntryText} {
+test winMenu-6.12 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4 -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.13 {GetEntryText} {
+test winMenu-6.13 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo" -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.14 {GetEntryText} {
+test winMenu-6.14 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it" -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.15 {GetEntryText} {
+test winMenu-6.15 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4 -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.16 {GetEntryText} {
+test winMenu-6.16 {GetEntryText} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4 -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} {
+test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -menu .m1.system
@@ -183,7 +168,7 @@ test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} {
     .m1.system add command -label bar
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} {
+test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label Hello
@@ -191,77 +176,77 @@ test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} {
     .m1 add command -label foo
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.3 {ReconfigureWindowsMenu - zero items} {
+test winMenu-7.3 {ReconfigureWindowsMenu - zero items} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     .m1 delete Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.4 {ReconfigureWindowsMenu - one item} {
+test winMenu-7.4 {ReconfigureWindowsMenu - one item} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.5 {ReconfigureWindowsMenu - two items} {
+test winMenu-7.5 {ReconfigureWindowsMenu - two items} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label One
     .m1 add command -label Two
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.6 {ReconfigureWindowsMenu - separator item} {
+test winMenu-7.6 {ReconfigureWindowsMenu - separator item} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add separator
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.7 {ReconfigureWindowsMenu - non-text item} {
+test winMenu-7.7 {ReconfigureWindowsMenu - non-text item} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.8 {ReconfigureWindowsMenu - disabled item} {
+test winMenu-7.8 {ReconfigureWindowsMenu - disabled item} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello -state disabled
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.9 {ReconfigureWindowsMenu - non-selected checkbutton} {
+test winMenu-7.9 {ReconfigureWindowsMenu - non-selected checkbutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add checkbutton -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.10 {ReconfigureWindowsMenu - non-selected radiobutton} {
+test winMenu-7.10 {ReconfigureWindowsMenu - non-selected radiobutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add radiobutton -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.11 {ReconfigureWindowsMenu - selected checkbutton} {
+test winMenu-7.11 {ReconfigureWindowsMenu - selected checkbutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add checkbutton -label Hello
     .m1 invoke Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.12 {ReconfigureWindowsMenu - selected radiobutton} {
+test winMenu-7.12 {ReconfigureWindowsMenu - selected radiobutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add radiobutton -label Hello
     .m1 invoke Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.13 {ReconfigureWindowsMenu - cascade missing} {
+test winMenu-7.13 {ReconfigureWindowsMenu - cascade missing} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.14 {ReconfigureWindowsMenu - cascade} {
+test winMenu-7.14 {ReconfigureWindowsMenu - cascade} {pcOnly} {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1 -tearoff 0
@@ -269,7 +254,7 @@ test winMenu-7.14 {ReconfigureWindowsMenu - cascade} {
     .m1 add cascade -menu .m2 -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1] [destroy .m2]
 } {0 {} {} {}}
-test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} {
+test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.file
@@ -277,7 +262,7 @@ test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} {
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} {
+test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -287,7 +272,7 @@ test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} {
     .m1.system add command -label Hello
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} {
+test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -295,7 +280,7 @@ test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} {
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} {
+test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -305,7 +290,7 @@ test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} {
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.19 {ReconfigureWindowsMenu - column break} {
+test winMenu-7.19 {ReconfigureWindowsMenu - column break} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -314,23 +299,23 @@ test winMenu-7.19 {ReconfigureWindowsMenu - column break} {
 } {0 {} {}}
 
 #Don't know how to generate nested post menus
-test winMenu-8.1 {TkpPostMenu} {
+test winMenu-8.1 {TkpPostMenu} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -postcommand "blork"
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {1 {invalid command name "blork"} {}}
-test winMenu-8.2 {TkpPostMenu} {
+test winMenu-8.2 {TkpPostMenu} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -postcommand "destroy .m1"
     list [.m1 post 40 40] [winfo exists .m1]
 } {{} 0}
-test winMenu-8.3 {TkpPostMenu - popup menu} {menuInteractive} {
+test winMenu-8.3 {TkpPostMenu - popup menu} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-8.3: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-8.4 {TkpPostMenu - menu button} {menuInteractive} {
+test winMenu-8.4 {TkpPostMenu - menu button} {pcOnly interactive} {
     catch {destroy .mb}
     menubutton .mb -text test -menu .mb.menu
     menu .mb.menu
@@ -338,7 +323,7 @@ test winMenu-8.4 {TkpPostMenu - menu button} {menuInteractive} {
     pack .mb
     list [tkMbPost .mb] [destroy .m1]
 } {{} {}}
-test winMenu-8.5 {TkpPostMenu - update not pending} {menuInteractive} {
+test winMenu-8.5 {TkpPostMenu - update not pending} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-8.5 - Hit ESCAPE."
@@ -346,13 +331,13 @@ test winMenu-8.5 {TkpPostMenu - update not pending} {menuInteractive} {
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-9.1 {TkpMenuNewEntry} {
+test winMenu-9.1 {TkpMenuNewEntry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-10.1 {TkwinMenuProc} {menuInteractive} {
+test winMenu-10.1 {TkwinMenuProc} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-10.1: Hit ESCAPE."
@@ -360,21 +345,21 @@ test winMenu-10.1 {TkwinMenuProc} {menuInteractive} {
 } {{} {}}
 
 # Can't generate a WM_INITMENU without a Tk menu yet.
-test winMenu-11.1 {TkWinHandleMenuEvent - WM_INITMENU} {menuInteractive} {
+test winMenu-11.1 {TkWinHandleMenuEvent - WM_INITMENU} {pcOnly interactive} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1 -postcommand "set foo test"
     .m1 add command -label "winMenu-11.1: Hit ESCAPE."
     list [.m1 post 40 40] [set foo] [unset foo] [destroy .m1]
 } {test test {} {}}
-test winMenu-11.2 {TkWinHandleMenuEvent - WM_COMMAND} {menuInteractive} {
+test winMenu-11.2 {TkWinHandleMenuEvent - WM_COMMAND} {pcOnly interactive} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1
     .m1 add checkbutton -variable foo -label "winMenu-11.2: Please select this menu item."
     list [.m1 post 40 40] [update] [set foo] [unset foo] [destroy .m1]
 } {{} {} 1 {} {}}
-test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {menuInteractive} {
+test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {pcOnly interactive} {
     catch {destroy .m1}
     catch {unset foo}
     proc bgerror {args} {
@@ -390,31 +375,33 @@ test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {menuInteractive} {
     (menu invoke)}} {} {}}
 
 # Can't test WM_MENUCHAR
-test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} {menuInteractive} {
+test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.3: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.5 {TkWinHandleMenuEvent - WM_MEASUREITEM} {menuInteractive} {
+test winMenu-11.5 {TkWinHandleMenuEvent - WM_MEASUREITEM} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label "winMenu-11.4: Hit ESCAPE" -hidemargin 1
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.6 {TkWinHandleMenuEvent - WM_DRAWITEM} {menuInteractive} {
+test winMenu-11.6 {TkWinHandleMenuEvent - WM_DRAWITEM} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.5: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.7 {TkWinHandleMenuEvent - WM_DRAWITEM - item disabled} {menuInteractive} {
+test winMenu-11.7 {TkWinHandleMenuEvent - WM_DRAWITEM - item disabled} \
+	{pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.6: Hit ESCAPE." -state disabled
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.8 {TkWinHandleMenuEvent - WM_INITMENU - not pending} {menuInteractive} {
+test winMenu-11.8 {TkWinHandleMenuEvent - WM_INITMENU - not pending} \
+	{pcOnly interactive} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label "winMenu-11.7: Hit ESCAPE"
@@ -422,14 +409,14 @@ test winMenu-11.8 {TkWinHandleMenuEvent - WM_INITMENU - not pending} {menuIntera
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-12.1 {TkpSetWindowMenuBar} {
+test winMenu-12.1 {TkpSetWindowMenuBar} {pcOnly} {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
     .m1 add command -label foo
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [catch {destroy .m1} msg2] $msg2
 } {0 {} {} 0 {}}
-test winMenu-12.2 {TkpSetWindowMenuBar} {
+test winMenu-12.2 {TkpSetWindowMenuBar} {pcOnly} {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -437,7 +424,7 @@ test winMenu-12.2 {TkpSetWindowMenuBar} {
     . configure -menu .m1
     list [catch {. configure -menu ""} msg] $msg [catch {destroy .m1} msg2] $msg2
 } {0 {} 0 {}}
-test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} {
+test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} {pcOnly} {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1 -tearoff 0
@@ -446,48 +433,48 @@ test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} {
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 
-test winMenu-13.1 {TkpSetMainMenubar - nothing to do} {} {}
+test winMenu-13.1 {TkpSetMainMenubar - nothing to do} {emptyTest pcOnly} {} {}
 
-test winMenu-14.1 {GetMenuIndicatorGeometry} {
+test winMenu-14.1 {GetMenuIndicatorGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     list [catch {tkTearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-14.2 {GetMenuIndicatorGeometry} {
+test winMenu-14.2 {GetMenuIndicatorGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -hidemargin 1
     list [catch {tkTearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test winMenu-15.1 {GetMenuAccelGeometry} {
+test winMenu-15.1 {GetMenuAccelGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo -accel Ctrl+U
     list [catch {tkTearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-15.2 {GetMenuAccelGeometry} {
+test winMenu-15.2 {GetMenuAccelGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     list [catch {tkTearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-15.3 {GetMenuAccelGeometry} {
+test winMenu-15.3 {GetMenuAccelGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     list [catch {tkTearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test winMenu-16.1 {GetTearoffEntryGeometry} {menuInteractive} {
+test winMenu-16.1 {GetTearoffEntryGeometry} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-19.1: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-17.1 {GetMenuSeparatorGeometry} {
+test winMenu-17.1 {GetMenuSeparatorGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -496,7 +483,7 @@ test winMenu-17.1 {GetMenuSeparatorGeometry} {
 
 # Currently, the only callers to DrawWindowsSystemBitmap want things
 # centered vertically, and either centered or right aligned horizontally.
-test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} {
+test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -504,7 +491,7 @@ test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} {
+test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
@@ -512,21 +499,22 @@ test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-19.1 {DrawMenuEntryIndicator - not checkbutton or radiobutton} {
+test winMenu-19.1 {DrawMenuEntryIndicator - not checkbutton or radiobutton} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.2 {DrawMenuEntryIndicator - not selected} {
+test winMenu-19.2 {DrawMenuEntryIndicator - not selected} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} {
+test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -534,7 +522,7 @@ test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} {
+test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo
@@ -542,7 +530,7 @@ test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.5 {DrawMenuEntryIndicator - disabled} {
+test winMenu-19.5 {DrawMenuEntryIndicator - disabled} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -551,7 +539,7 @@ test winMenu-19.5 {DrawMenuEntryIndicator - disabled} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} {
+test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
@@ -560,42 +548,44 @@ test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-20.1 {DrawMenuEntryAccelerator - disabled} {
+test winMenu-20.1 {DrawMenuEntryAccelerator - disabled} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground red
     .m1 add command -label foo -accel "Ctrl+U" -state disabled
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.2 {DrawMenuEntryAccelerator - normal text} {
+test winMenu-20.2 {DrawMenuEntryAccelerator - normal text} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.3 {DrawMenuEntryAccelerator - disabled, no disabledforeground} {
+test winMenu-20.3 {DrawMenuEntryAccelerator - disabled, no disabledforeground} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -accel "Ctrl+U" -state disabled
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.4 {DrawMenuEntryAccelerator - cascade, drawArrow true} {
+test winMenu-20.4 {DrawMenuEntryAccelerator - cascade, drawArrow true} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.5 {DrawMenuEntryAccelerator - cascade, drawArrow false} {menuInteractive} {
+test winMenu-20.5 {DrawMenuEntryAccelerator - cascade, drawArrow false} \
+	{pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label "winMenu-23.5: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-21.1 {DrawMenuSeparator} {
+test winMenu-21.1 {DrawMenuSeparator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -603,7 +593,7 @@ test winMenu-21.1 {DrawMenuSeparator} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-22.1 {DrawMenuUnderline} {
+test winMenu-22.1 {DrawMenuUnderline} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -underline 0
@@ -611,24 +601,26 @@ test winMenu-22.1 {DrawMenuUnderline} {
     list [update] [destroy .m1]
 } {{} {}}   
 
-test winMenu-23.1 {Don't know how to test MenuKeyBindProc} {} {}
-test winMenu-24.1 {TkpInitializeMenuBindings called at boot time} {} {}
+test winMenu-23.1 {Don't know how to test MenuKeyBindProc} \
+	{pcOnly emptyTest} {} {}
+test winMenu-24.1 {TkpInitializeMenuBindings called at boot time} \
+	{pcOnly emptyTest} {} {}
 
-test winMenu-25.1 {DrawMenuEntryLabel - normal} {
+test winMenu-25.1 {DrawMenuEntryLabel - normal} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-25.2 {DrawMenuEntryLabel - disabled with fg} {
+test winMenu-25.2 {DrawMenuEntryLabel - disabled with fg} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground red
     .m1 add command -label foo -state disabled
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} {
+test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -state disabled
@@ -636,27 +628,27 @@ test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-26.1 {TkpComputeMenubarGeometry} {
+test winMenu-26.1 {TkpComputeMenubarGeometry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File
     list [. configure -menu .m1] [. configure -menu ""] [destroy .m1]
 } {{} {} {}}
 
-test winMenu-27.1 {DrawTearoffEntry} {menuInteractive} {
+test winMenu-27.1 {DrawTearoffEntry} {pcOnly interactive} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-24.4: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-28.1 {TkpConfigureMenuEntry - update pending} {
+test winMenu-28.1 {TkpConfigureMenuEntry - update pending} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {.m1 add command -label Two} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} {
+test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label One
@@ -664,7 +656,8 @@ test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} {
     list [catch {.m1 add command -label Two} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} {
+test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -672,7 +665,8 @@ test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} {
+test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground red
@@ -680,7 +674,7 @@ test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} {
+test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     set tk_strictMotif 1
@@ -689,42 +683,44 @@ test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } {{} {} 0}
-test winMenu-29.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} {
+test winMenu-29.4 \
+	{TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled -background red
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} {
+test winMenu-29.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} {
+test winMenu-29.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -state disabled
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.7 {TkpDrawMenuEntry - gc for normal - custom entry} {
+test winMenu-29.7 {TkpDrawMenuEntry - gc for normal - custom entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -foreground red
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.8 {TkpDrawMenuEntry - gc for normal} {
+test winMenu-29.8 {TkpDrawMenuEntry - gc for normal} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {
+test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -selectcolor orange
@@ -732,7 +728,7 @@ test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} {
+test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -740,7 +736,7 @@ test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} {
+test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activebackground green
@@ -748,7 +744,7 @@ test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.12 {TkpDrawMenuEntry - border} {
+test winMenu-29.12 {TkpDrawMenuEntry - border} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -756,7 +752,7 @@ test winMenu-29.12 {TkpDrawMenuEntry - border} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} {
+test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} {pcOnly} {
     catch {destroy .m1}
     set tk_strictMotif 1
     menu .m1
@@ -765,7 +761,7 @@ test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } {{} {} 0}
-test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} {
+test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground yellow
@@ -773,7 +769,7 @@ test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.15 {TkpDrawMenuEntry - active border} {
+test winMenu-29.15 {TkpDrawMenuEntry - active border} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -781,35 +777,35 @@ test winMenu-29.15 {TkpDrawMenuEntry - active border} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.16 {TkpDrawMenuEntry - font - custom entry} {
+test winMenu-29.16 {TkpDrawMenuEntry - font - custom entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -font "Helvectica 72"
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.17 {TkpDrawMenuEntry - font} {
+test winMenu-29.17 {TkpDrawMenuEntry - font} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -font "Courier 72"
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.18 {TkpDrawMenuEntry - separator} {
+test winMenu-29.18 {TkpDrawMenuEntry - separator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.19 {TkpDrawMenuEntry - standard} {
+test winMenu-29.19 {TkpDrawMenuEntry - standard} {pcOnly} {
     catch {destroy .mb}
     menu .m1
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} {
+test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File -menu .m1.file
@@ -819,7 +815,7 @@ test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.21 {TkpDrawMenuEntry - indicator} {
+test winMenu-29.21 {TkpDrawMenuEntry - indicator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label winMenu-31.20
@@ -827,7 +823,7 @@ test winMenu-29.21 {TkpDrawMenuEntry - indicator} {
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.22 {TkpDrawMenuEntry - indicator} {
+test winMenu-29.22 {TkpDrawMenuEntry - indicator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label winMenu-31.21 -hidemargin 1
@@ -836,7 +832,7 @@ test winMenu-29.22 {TkpDrawMenuEntry - indicator} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-30.1 {GetMenuLabelGeometry - image} {
+test winMenu-30.1 {GetMenuLabelGeometry - image} {pcOnly} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
@@ -844,33 +840,33 @@ test winMenu-30.1 {GetMenuLabelGeometry - image} {
     .m1 add command -image image1
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test winMenu-30.2 {GetMenuLabelGeometry - bitmap} {
+test winMenu-30.2 {GetMenuLabelGeometry - bitmap} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -bitmap questhead
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-30.3 {GetMenuLabelGeometry - no text} {
+test winMenu-30.3 {GetMenuLabelGeometry - no text} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-30.4 {GetMenuLabelGeometry - text} {
+test winMenu-30.4 {GetMenuLabelGeometry - text} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "This is a test."
     list [update idletasks] [destroy .m1]
 } {{} {}}
 
-test winMenu-31.1 {DrawMenuEntryBackground} {
+test winMenu-31.1 {DrawMenuEntryBackground} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tkTearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-31.2 {DrawMenuEntryBackground} {
+test winMenu-31.2 {DrawMenuEntryBackground} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -879,25 +875,25 @@ test winMenu-31.2 {DrawMenuEntryBackground} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-32.1 {TkpComputeStandardMenuGeometry - no entries} {
+test winMenu-32.1 {TkpComputeStandardMenuGeometry - no entries} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.2 {TkpComputeStandardMenuGeometry - one entry} {
+test winMenu-32.2 {TkpComputeStandardMenuGeometry - one entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.3 {TkpComputeStandardMenuGeometry - more than one entry} {
+test winMenu-32.3 {TkpComputeStandardMenuGeometry - more than one entry} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     .m1 add command -label "two"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.4 {TkpComputeStandardMenuGeometry - separator} {
+test winMenu-32.4 {TkpComputeStandardMenuGeometry - separator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -912,60 +908,65 @@ test winMenu-32.5 {TkpComputeStandardMenuGeometry - tearoff entry} {unixOnly} {
     catch {tkMbPost .mb}
     list [update] [destroy .mb]
 } {{} {}}
-test winMenu-32.6 {TkpComputeStandardMenuGeometry - standard label geometry} {
+test winMenu-32.6 {TkpComputeStandardMenuGeometry - standard label geometry} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.7 {TkpComputeStandardMenuGeometry - different font for entry} {
+test winMenu-32.7 {TkpComputeStandardMenuGeometry - different font for entry} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1 -font "Helvetica 12"
     .m1 add command -label "test" -font "Courier 12"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.8 {TkpComputeStandardMenuGeometry - second entry larger} {
+test winMenu-32.8 {TkpComputeStandardMenuGeometry - second entry larger} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     .m1 add command -label "test test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.9 {TkpComputeStandardMenuGeometry - first entry larger} {
+test winMenu-32.9 {TkpComputeStandardMenuGeometry - first entry larger} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test test"
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.10 {TkpComputeStandardMenuGeometry - accelerator} {
+test winMenu-32.10 {TkpComputeStandardMenuGeometry - accelerator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test" -accel "Ctrl+S"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.11 {TkpComputeStandardMenuGeometry - second accel larger} {
+test winMenu-32.11 {TkpComputeStandardMenuGeometry - second accel larger} {pcOnly} {
     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 winMenu-32.12 {TkpComputeStandardMenuGeometry - second accel smaller} {
+test winMenu-32.12 {TkpComputeStandardMenuGeometry - second accel smaller} {pcOnly} {
     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 winMenu-32.13 {TkpComputeStandardMenuGeometry - indicator} {
+test winMenu-32.13 {TkpComputeStandardMenuGeometry - indicator} {pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label test
     .m1 invoke 1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.14 {TkpComputeStandardMenuGeometry - second indicator less or equal } {
+test winMenu-32.14 \
+	{TkpComputeStandardMenuGeometry - second indicator less or equal} \
+	{pcOnly} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -976,7 +977,8 @@ test winMenu-32.14 {TkpComputeStandardMenuGeometry - second indicator less or eq
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test winMenu-32.15 {TkpComputeStandardMenuGeometry - second indicator larger } {unixOnly} {
+test winMenu-32.15 {TkpComputeStandardMenuGeometry - second indicator larger} \
+	{unixOnly} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -987,12 +989,14 @@ test winMenu-32.15 {TkpComputeStandardMenuGeometry - second indicator larger } {
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test winMenu-32.16 {TkpComputeStandardMenuGeometry - zero sized menus} {
+test winMenu-32.16 {TkpComputeStandardMenuGeometry - zero sized menus} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} {
+test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label one
@@ -1000,7 +1004,8 @@ test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} {
     .m1 add command -label three -columnbreak 1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.18 {TkpComputeStandardMenuGeometry - second column bigger} {
+test winMenu-32.18 {TkpComputeStandardMenuGeometry - second column bigger} \
+	{pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -1008,7 +1013,7 @@ test winMenu-32.18 {TkpComputeStandardMenuGeometry - second column bigger} {
     .m1 add command -label three
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} {
+test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} {pcOnly} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -1020,14 +1025,14 @@ test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} {
     list [update idletasks] [destroy .m1]    
 } {{} {}}
 
-test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} {
+test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} {pcOnly} {
     catch {destroy .t2}
     catch {destroy .m1}
     toplevel .t2 -menu .m1
     wm geometry .t2 +0+0
     list [update idletasks] [destroy .t2]
 } {{} {}}
-test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} {
+test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} {pcOnly} {
     catch {destroy .t2}
     catch {destroy .m1}
     menu .m1
@@ -1040,9 +1045,20 @@ test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} {
     list [update idletasks] [destroy .m1] [destroy .t2]
 } {{} {} {}}
 
-test winMenu-34.1 {TkpMenuInit called at boot time} {} {}
+test winMenu-34.1 {TkpMenuInit called at boot time} {emptyTest pcOnly} {} {}
 
 # cleanup
 deleteWindows
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winSend.test b/tests/winSend.test
index 5e116cb..3ee1505 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -7,14 +7,14 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winSend.test,v 1.1.2.3 1999/03/11 18:51:22 hershey Exp $
+# RCS: @(#) $Id: winSend.test,v 1.1.2.4 1999/03/24 01:17:19 hershey Exp $
 
 if {$tcl_platform(platform) != "windows"} {
     puts "skipping: Windows only tests..."
     return
 }
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -414,5 +414,5 @@ while {[llength $newInterps] != [llength $currentInterps]} {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
diff --git a/tests/winWm.test b/tests/winWm.test
index 25ddb72..6a20d74 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -9,14 +9,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winWm.test,v 1.1.4.2 1999/03/11 18:51:23 hershey Exp $
+# RCS: @(#) $Id: winWm.test,v 1.1.4.3 1999/03/24 01:17:20 hershey Exp $
 
-if {$tcl_platform(platform) != "windows"} {
-    puts "skipping: Windows only tests..."
-    return
-}
-
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -41,7 +36,7 @@ update
 set menuheight [expr $menuheight - [winfo y .t]]
 destroy .t
 
-test winWm-1.1 {TkWmMapWindow} {
+test winWm-1.1 {TkWmMapWindow} {pcOnly} {
     toplevel .t
     wm override .t 1
     wm geometry .t +0+0
@@ -50,7 +45,7 @@ test winWm-1.1 {TkWmMapWindow} {
     destroy .t
     set result
 } {0 0}
-test winWm-1.2 {TkWmMapWindow} {
+test winWm-1.2 {TkWmMapWindow} {pcOnly} {
     toplevel .t
     wm transient .t .
     update
@@ -62,7 +57,7 @@ test winWm-1.2 {TkWmMapWindow} {
     destroy .t
     set msg
 } {can't iconify ".t": it is a transient}
-test winWm-1.3 {TkWmMapWindow} {
+test winWm-1.3 {TkWmMapWindow} {pcOnly} {
     toplevel .t
     update
     toplevel .t2
@@ -71,7 +66,7 @@ test winWm-1.3 {TkWmMapWindow} {
     destroy .t .t2
     set result
 } 1
-test winWm-1.4 {TkWmMapWindow} {
+test winWm-1.4 {TkWmMapWindow} {pcOnly} {
     toplevel .t
     wm geometry .t +10+10
     update
@@ -82,7 +77,7 @@ test winWm-1.4 {TkWmMapWindow} {
     destroy .t .t2
     set result
 } {10 40}
-test winWm-1.5 {TkWmMapWindow} {
+test winWm-1.5 {TkWmMapWindow} {pcOnly} {
     toplevel .t
     wm iconify .t
     update
@@ -91,7 +86,7 @@ test winWm-1.5 {TkWmMapWindow} {
     set result
 } iconic
 
-test winWm-2.1 {TkpWmSetState} {
+test winWm-2.1 {TkpWmSetState} {pcOnly} {
     toplevel .t
     wm geometry .t 150x50+10+10
     update
@@ -105,7 +100,7 @@ test winWm-2.1 {TkpWmSetState} {
     destroy .t
     set result
 } {normal iconic normal}
-test winWm-2.2 {TkpWmSetState} {
+test winWm-2.2 {TkpWmSetState} {pcOnly} {
     toplevel .t
     wm geometry .t 150x50+10+10
     update
@@ -122,7 +117,7 @@ test winWm-2.2 {TkpWmSetState} {
     destroy .t
     set result
 } {normal withdrawn iconic normal}
-test winWm-2.3 {TkpWmSetState} {
+test winWm-2.3 {TkpWmSetState} {pcOnly} {
     set result {}
     toplevel .t
     wm geometry .t 150x50+10+10
@@ -142,7 +137,7 @@ test winWm-2.3 {TkpWmSetState} {
 } {{normal 150x50+10+10} {iconic 150x50+10+10} {iconic 150x50+10+10} {normal 200x50+10+10}}
 
 
-test winWm-3.1 {ConfigureTopLevel: window geometry propagation} {
+test winWm-3.1 {ConfigureTopLevel: window geometry propagation} {pcOnly} {
     toplevel .t
     wm geometry .t +0+0
     button .t.b
@@ -161,7 +156,7 @@ test winWm-3.1 {ConfigureTopLevel: window geometry propagation} {
     set x
 } 1
 
-test winWm-4.1 {ConfigureTopLevel: menu resizing} {
+test winWm-4.1 {ConfigureTopLevel: menu resizing} {pcOnly} {
     set result {}
     toplevel .t
     frame .t.f -width 150 -height 50 -bg red
@@ -178,7 +173,7 @@ test winWm-4.1 {ConfigureTopLevel: menu resizing} {
     set result
 } [expr $menuheight + 1]
 
-test winWm-5.1 {UpdateGeometryInfo: menu resizing} {
+test winWm-5.1 {UpdateGeometryInfo: menu resizing} {pcOnly} {
     set result {}
     toplevel .t
     frame .t.f -width 150 -height 50 -bg red
@@ -197,7 +192,7 @@ test winWm-5.1 {UpdateGeometryInfo: menu resizing} {
     destroy .t
     set result
 } {50 50 50}
-test winWm-5.2 {UpdateGeometryInfo: menu resizing} {
+test winWm-5.2 {UpdateGeometryInfo: menu resizing} {pcOnly} {
     set result {}
     toplevel .t
     frame .t.f -width 150 -height 50 -bg red
@@ -219,5 +214,16 @@ test winWm-5.2 {UpdateGeometryInfo: menu resizing} {
 } {50 50 0}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/window.test b/tests/window.test
index 25306f8..088257a 100644
--- a/tests/window.test
+++ b/tests/window.test
@@ -5,9 +5,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: window.test,v 1.1.4.2 1999/03/11 18:51:24 hershey Exp $
+# RCS: @(#) $Id: window.test,v 1.1.4.3 1999/03/24 01:17:21 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -136,5 +136,16 @@ test window-5.1 {Tk_MakeWindowExist procedure, stacking order and menubars} unix
 } {}
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/winfo.test b/tests/winfo.test
index 052e5a6..1376889 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -6,9 +6,9 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winfo.test,v 1.1.4.3 1999/03/11 18:51:24 hershey Exp $
+# RCS: @(#) $Id: winfo.test,v 1.1.4.4 1999/03/24 01:17:21 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
@@ -366,5 +366,16 @@ foreach i [winfo children .] {
 }
 
 # cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/xmfbox.test b/tests/xmfbox.test
index 554d05b..4a37ce6 100644
--- a/tests/xmfbox.test
+++ b/tests/xmfbox.test
@@ -9,18 +9,12 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: xmfbox.test,v 1.1.2.3 1999/03/11 18:51:25 hershey Exp $
+# RCS: @(#) $Id: xmfbox.test,v 1.1.2.4 1999/03/24 01:17:22 hershey Exp $
 
-if {[lsearch [namespace children] ::test] == -1} {
+if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
-if {$tcl_platform(platform) != "unix"} {
-    # This test is needed only on Unix platforms. Windows and Mac
-    # have their own Native file dialogs.
-    return
-}
-
 set testPWD [pwd]
 eval destroy [winfo children .]
 catch {unset foo}
@@ -65,14 +59,14 @@ proc cleanup {} {
     catch {destroy .foo}
 }
 
-test xmfbox-1.1 {tkMotifFDialog_Create, -parent switch} {
+test xmfbox-1.1 {tkMotifFDialog_Create, -parent switch} {unixOnly} {
     catch {unset foo}
     set x [tkMotifFDialog_Create foo open {-parent .}]
     catch {destroy $x}
     set x
 } .foo
 
-test xmfbox-1.2 {tkMotifFDialog_Create, -parent switch} {
+test xmfbox-1.2 {tkMotifFDialog_Create, -parent switch} {unixOnly} {
     catch {unset foo}
     toplevel .bar
     set x [tkMotifFDialog_Create foo open {-parent .bar}]
@@ -81,7 +75,7 @@ test xmfbox-1.2 {tkMotifFDialog_Create, -parent switch} {
     set x
 } .bar.foo
 
-test xmfbox-2.1 {tkMotifFDialog_InterpFilter, ~ in dir names} {
+test xmfbox-2.1 {tkMotifFDialog_InterpFilter, ~ in dir names} {unixOnly} {
     cleanup
     file mkdir ./~nosuchuser1
     set x [tkMotifFDialog_Create foo open {}]
@@ -90,7 +84,7 @@ test xmfbox-2.1 {tkMotifFDialog_InterpFilter, ~ in dir names} {
     set kk [tkMotifFDialog_InterpFilter $x]
 } [list $testPWD/~nosuchuser1 *]
 
-test xmfbox-2.2 {tkMotifFDialog_InterpFilter, ~ in file names} {
+test xmfbox-2.2 {tkMotifFDialog_InterpFilter, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
@@ -99,7 +93,7 @@ test xmfbox-2.2 {tkMotifFDialog_InterpFilter, ~ in file names} {
     set kk [tkMotifFDialog_InterpFilter $x]
 } [list $testPWD ./~nosuchuser1]
 
-test xmfbox-2.3 {tkMotifFDialog_Update, ~ in file names} {
+test xmfbox-2.3 {tkMotifFDialog_Update, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
@@ -110,7 +104,7 @@ test xmfbox-2.3 {tkMotifFDialog_Update, ~ in file names} {
     $foo(fList) get end
 } ~nosuchuser1
 
-test xmfbox-2.4 {tkMotifFDialog_LoadFile, ~ in file names} {
+test xmfbox-2.4 {tkMotifFDialog_LoadFile, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
@@ -118,7 +112,7 @@ test xmfbox-2.4 {tkMotifFDialog_LoadFile, ~ in file names} {
     expr {$i >= 0}
 } 1
 
-test xmfbox-2.5 {tkMotifFDialog_BrowseFList, ~ in file names} {
+test xmfbox-2.5 {tkMotifFDialog_BrowseFList, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
@@ -129,7 +123,7 @@ test xmfbox-2.5 {tkMotifFDialog_BrowseFList, ~ in file names} {
     $foo(sEnt) get
 } $testPWD/~nosuchuser1
 
-test xmfbox-2.5 {tkMotifFDialog_ActivateFList, ~ in file names} {
+test xmfbox-2.5 {tkMotifFDialog_ActivateFList, ~ in file names} {unixOnly} {
     cleanup
     close [open ./~nosuchuser1 {CREAT TRUNC WRONLY}]
     set x [tkMotifFDialog_Create foo open {}]
@@ -143,5 +137,16 @@ test xmfbox-2.5 {tkMotifFDialog_ActivateFList, ~ in file names} {
 
 # cleanup
 cleanup
-::test::cleanupTests
+::tcltest::cleanupTests
 return
+
+
+
+
+
+
+
+
+
+
+
-- 
cgit v0.12