* Merged 8.1 branch into the main trunk

1 files changed, 25 insertions, 8 deletions

diff --git a/tests/macMenu.test b/tests/macMenu.test
index 3882b0d..b76b7e6 100644
--- a/tests/macMenu.test
+++ b/tests/macMenu.test
@@ -4,13 +4,18 @@
 # system.
 #
 # Copyright (c) 1995-1997 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+# All rights reserved.
 #
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: macMenu.test,v 1.2 1998/09/14 18:23:48 stanton Exp $
+# RCS: @(#) $Id: macMenu.test,v 1.3 1999/04/16 01:51:39 stanton Exp $
+
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 if {$tcl_platform(platform) != "macintosh"} {
+    puts "skipping: Mac only tests..."
+    ::tcltest::cleanupTests
     return
 }
 
@@ -18,13 +23,10 @@ if {[lsearch [image types] test] < 0} {
     puts "This application hasn't been compiled with the \"test\" image"
     puts "type, so I can't run this test.  Are you sure you're using"
     puts "tktest instead of wish?"
+    ::tcltest::cleanupTests
     return
 }
 
-if {[info procs test] != "test"} {
-    source defs
-}
-
 proc deleteWindows {} {
     foreach i [winfo children .] {
     	catch [destroy $i]
@@ -1561,5 +1563,20 @@ test macMenu-44.2 {DrawMenuEntryBackground} {
 
 test macMenu-45.1 {TkpMenuInit - called at boot time} {} {}
 
+# cleanup
 deleteWindows
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+