1 files changed, 50 insertions, 42 deletions

diff --git a/tests/macWinMenu.test b/tests/macWinMenu.test
index e19fdff..2aad508 100644
--- a/tests/macWinMenu.test
+++ b/tests/macWinMenu.test
@@ -3,26 +3,27 @@
 # the common implementation of Macintosh and Windows menus.
 #
 # Copyright (c) 1995-1996 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: macWinMenu.test,v 1.2 1998/09/14 18:23:48 stanton Exp $
+# RCS: @(#) $Id: macWinMenu.test,v 1.3 1999/04/16 01:51:39 stanton Exp $
 
-if {$tcl_platform(platform) == "unix"} {
-    return
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
 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
-}
+# Some tests require user interaction on non-unix platform
+set ::tcltest::testConfig(nonUnixUserInteraction) \
+    [expr {$::tcltest::testConfig(userInteraction) || \
+	$::tcltest::testConfig(unixOnly)}]
 
 proc deleteWindows {} {
     foreach i [winfo children .] {
@@ -34,33 +35,26 @@ 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."
-}
-
-test macWinMenu-1.1 {PreprocessMenu} {
+test macWinMenu-1.1 {PreprocessMenu} {macOrPc nonUnixUserInteraction} {
     catch {destroy .m1}
     menu .m1 -postcommand "destroy .m1"
     .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]} {
-    test macWinMenu-1.2 {PreprocessMenu} {
-	catch {destroy .m1}
-	catch {destroy .m2}
-	set foo1 foo
-	set foo2 foo
-	menu .m1 -postcommand "set foo1 .m1"
-	.m1 add cascade -menu .m2 -label "macWinMenu-1.2: Hit Escape"
-	menu .m2 -postcommand "set foo2 .m2"
-	update idletasks
-	list [catch {.m1 post 40 40} msg] $msg [set foo1] [set foo2] [destroy .m1 .m2] [catch {unset foo1}] [catch {unset foo2}]
-    } {0 .m2 .m1 .m2 {} 0 0}
-}
-test macWinMenu-1.3 {PreprocessMenu} {
+test macWinMenu-1.2 {PreprocessMenu} {macOrPc nonUnixUserInteraction} {
+    catch {destroy .m1}
+    catch {destroy .m2}
+    set foo1 foo
+    set foo2 foo
+    menu .m1 -postcommand "set foo1 .m1"
+    .m1 add cascade -menu .m2 -label "macWinMenu-1.2: Hit Escape"
+    menu .m2 -postcommand "set foo2 .m2"
+    update idletasks
+    list [catch {.m1 post 40 40} msg] $msg [set foo1] [set foo2] \
+	    [destroy .m1 .m2] [catch {unset foo1}] [catch {unset foo2}]
+} {0 .m2 .m1 .m2 {} 0 0}
+
+test macWinMenu-1.3 {PreprocessMenu} {macOrPc nonUnixUserInteraction} {
     catch {destroy .l1}
     catch {destroy .m1}
     catch {destroy .m2}
@@ -76,7 +70,7 @@ test macWinMenu-1.3 {PreprocessMenu} {
     update idletasks
     list [catch {.m1 post 40 40} msg] $msg [destroy .l1 .m2 .m3]
 } {0 {} {}}
-test macWinMenu-1.4 {PreprocessMenu} {
+test macWinMenu-1.4 {PreprocessMenu} {macOrPc} {
     catch {destroy .l1}
     catch {destroy .m1}
     catch {destroy .m2}
@@ -95,7 +89,7 @@ test macWinMenu-1.4 {PreprocessMenu} {
     update idletasks
     list [catch {.m1 post 40 40} msg] $msg [destroy .l1 .m2 .m3 .m4]
 } {0 {} {}}
-test macWinMenu-1.5 {PreprocessMenu} {
+test macWinMenu-1.5 {PreprocessMenu} {macOrPc} {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1
@@ -104,14 +98,28 @@ 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]} {
-    test macWinMenu-2.1 {TkPreprocessMenu} {
-	catch {destroy .m1}
-	set foo test
-	menu .m1 -postcommand "set foo 2.1"
-	.m1 add command -label "macWinMenu-2.1: Hit Escape"
-	list [catch {.m1 post 40 40} msg] $msg [set foo] [destroy .m1] [unset foo]
-    } {0 2.1 2.1 {} {}}
-}
+test macWinMenu-2.1 {TkPreprocessMenu} {macOrPc nonUnixUserInteraction} {
+    catch {destroy .m1}
+    set foo test
+    menu .m1 -postcommand "set foo 2.1"
+    .m1 add command -label "macWinMenu-2.1: Hit Escape"
+    list [catch {.m1 post 40 40} msg] $msg [set foo] [destroy .m1] [unset foo]
+} {0 2.1 2.1 {} {}}
 
+# cleanup
 deleteWindows
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+
+