1 files changed, 26 insertions, 11 deletions
diff --git a/tk/tests/canvRect.test b/tk/tests/canvRect.test
index 28018935549..c83f5fc52d1 100644
--- a/tk/tests/canvRect.test
+++ b/tk/tests/canvRect.test
@@ -3,14 +3,13 @@
 # in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+# All rights reserved.
 #
 # RCS: @(#) $Id$
 
-if {[info procs test] != "test"} {
-    source defs
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
 }
 
 foreach i [winfo children .] {
@@ -33,7 +32,7 @@ foreach test {
     {-outline #123456 #123456 bad_color {unknown color name "bad_color"}}
     {-stipple gray50 gray50 bogus {bitmap "bogus" not defined}}
     {-tags {test a b c} {test a b c} {} {}}
-    {-width 6 6 abc {bad screen distance "abc"}}
+    {-width 6.0 6.0 abc {bad screen distance "abc"}}
 } {
     set name [lindex $test 0]
     test canvRect-1.$i {configuration options} {
@@ -118,11 +117,10 @@ test canvRect-3.7 {RectOvalCoords procedure} {
 test canvRect-4.1 {ConfigureRectOval procedure} {
     list [catch {.c itemconfigure x -width abc} msg] $msg \
 	    [.c itemcget x -width]
-} {1 {bad screen distance "abc"} 1}
+} {1 {bad screen distance "abc"} 1.0}
 test canvRect-4.2 {ConfigureRectOval procedure} {
-    .c itemconfigure x -width -5
-    .c itemcget x -width
-} {1}
+    list [catch {.c itemconfigure x -width -5} msg] $msg
+} {1 {bad screen distance "-5"}}
 test canvRect-4.3 {ConfigureRectOval procedure} {nonPortable} {
     # Non-portable due to rounding differences.
     .c itemconfigure x -width 10
@@ -294,7 +292,7 @@ test canvRect-10.1 {TranslateRectOval procedure} {
 # This test is non-portable because different color information
 # will get generated on different displays (e.g. mono displays
 # vs. color).
-test canvRect-11.1 {RectOvalToPostscript procedure} {nonPortable win32sCrash macCrash} {
+test canvRect-11.1 {RectOvalToPostscript procedure} {nonPortable macCrash} {
     # Crashes on Mac because the XGetImage() call isn't implemented, causing a
     # dereference of NULL.
     
@@ -327,3 +325,20 @@ restore showpage
 end
 %%EOF
 }
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+
+