improved use of test constraints

1 files changed, 8 insertions, 28 deletions

diff --git a/tests/macscrollbar.test b/tests/macscrollbar.test
index 4abf137..479f8c6 100644
--- a/tests/macscrollbar.test
+++ b/tests/macscrollbar.test
@@ -7,19 +7,12 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: macscrollbar.test,v 1.3 1999/04/16 01:51:39 stanton Exp $
+# RCS: @(#) $Id: macscrollbar.test,v 1.4 2001/09/21 20:38:18 hobbs Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
-# Only run this test on the Macintosh
-if {$tcl_platform(platform) != "macintosh"} {
-    puts "skipping: Mac only tests..."
-    ::tcltest::cleanupTests
-    return
-}
-
 foreach i [winfo children .] {
     destroy $i
 }
@@ -32,10 +25,10 @@ wm geometry . 50x300
 scrollbar .s
 pack .s -fill y -expand 1
 update
-test macscroll-1.1 {TkpDisplayScrollbar procedure} {
+test macscroll-1.1 {TkpDisplayScrollbar procedure} {macOnly} {
     list [.s configure -width] [.s configure -bd]
 } {{-width width Width 16 16} {-borderwidth borderWidth BorderWidth 0 0}}
-test macscroll-1.2 {TkpDisplayScrollbar procedure} {
+test macscroll-1.2 {TkpDisplayScrollbar procedure} {macOnly} {
     # Exercise drawing 3D relief
     pack .s -fill y -expand 1 -anchor center
     .s configure -bd 4
@@ -43,7 +36,7 @@ test macscroll-1.2 {TkpDisplayScrollbar procedure} {
     focus .s
     update
 } {}
-test macscroll-1.3 {TkpDisplayScrollbar procedure} {
+test macscroll-1.3 {TkpDisplayScrollbar procedure} {macOnly} {
     pack .s -fill y -expand 1 -anchor e
     update
     set x [.s configure -width]
@@ -51,7 +44,7 @@ test macscroll-1.3 {TkpDisplayScrollbar procedure} {
     update
     list [.s configure -width] $x
 } {{-width width Width 16 16} {-width width Width 16 16}}
-test macscroll-1.4 {TkpDisplayScrollbar procedure} {
+test macscroll-1.4 {TkpDisplayScrollbar procedure} {macOnly} {
     wm geometry . 300x50
     .s configure -bd 0 -orient horizontal
     pack .s -fill x -expand 1 -anchor center
@@ -64,7 +57,7 @@ test macscroll-1.4 {TkpDisplayScrollbar procedure} {
     update
     list [.s configure -width] $x $y
 } {{-width width Width 16 16} {-width width Width 16 16} {-width width Width 16 16}}
-test macscroll-1.5 {TkpDisplayScrollbar procedure} {
+test macscroll-1.5 {TkpDisplayScrollbar procedure} {macOnly} {
     wm geometry . 300x16
     .s configure -bd 0 -orient horizontal
     pack .s -fill x -expand 1 -anchor s
@@ -74,7 +67,7 @@ test macscroll-1.5 {TkpDisplayScrollbar procedure} {
     wm geometry . 300x14
     update
 } {}
-test macscroll-1.6 {TkpDisplayScrollbar procedure} {
+test macscroll-1.6 {TkpDisplayScrollbar procedure} {macOnly} {
     # Check the drawing of the resize hack
     wm geometry . 20x300
     wm resizable . 1 1
@@ -90,7 +83,7 @@ test macscroll-1.6 {TkpDisplayScrollbar procedure} {
     update
     list $x $y [.s identify 12 295]
 } {{} arrow2 arrow2}
-test macscroll-1.7 {TkpDisplayScrollbar procedure} {
+test macscroll-1.7 {TkpDisplayScrollbar procedure} {macOnly} {
     wm geometry . 300x300
     pack .s -fill y -expand 1 -anchor e
     catch {destroy .s2}
@@ -105,16 +98,3 @@ foreach i [winfo children .] {
 # cleanup
 ::tcltest::cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-
-