touched all tk files to ease next import

[pf3gnuchains/pf3gnuchains4x.git] / tk / tests / option.test

diff --git a/tk/tests/option.test b/tk/tests/option.test
index 42c4d3b..aaa55ed 100644 (file)
--- a/tk/tests/option.test
+++ b/tk/tests/option.test
@@ -3,14 +3,14 @@
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994 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 {[string compare test [info procs test]] == 1} then \
-  {source defs}
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
 
 catch {destroy .op1}
 catch {destroy .op2}
@@ -185,15 +185,9 @@ test option-14.12 {error conditions} {
     list [catch {option get .gorp.gorp a A} msg] $msg
 } {1 {bad window path name ".gorp.gorp"}}
 
-if {$tcl_platform(os) == "Win32s"} {
-    set option1 OPTION~2.FIL
-    set option2 OPTION~1.FIL
-    set option3 OPTION~3.FIL
-} else {
-    set option1 option.file1
-    set option2 option.file2
-    set option3 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} {
     list [catch {option read non-existent} msg] $msg
@@ -229,4 +223,20 @@ test option-16.1 {ReadOptionFile} {
 
 catch {destroy .op1}
 catch {destroy .op2}
-concat {}
+
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+
+