merged tcl 8.1 branch back into the main trunk

1 files changed, 22 insertions, 3 deletions

diff --git a/tests/history.test b/tests/history.test
index 4417049..c7f7d20 100644
--- a/tests/history.test
+++ b/tests/history.test
@@ -6,20 +6,24 @@
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: history.test,v 1.2 1998/09/14 18:40:09 stanton Exp $
+# RCS: @(#) $Id: history.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
   
+if {[lsearch [namespace children] ::tcltest] == -1} {
+    source [file join [pwd] [file dirname [info script]] defs.tcl]
+}
+
 if {[catch {history}]} {
     puts stdout "This version of Tcl was built without the history command;\n"
     puts stdout "history tests will be skipped.\n"
+    ::tcltest::cleanupTests
     return
 }
 
-if {[string compare test [info procs test]] == 1} then {source defs}
-
 set num [history nextid]
 history keep 3
 history add {set a 12345}
@@ -209,3 +213,18 @@ test history-9.2 {miscellaneous} {
     set msg
 } {bad option "gorp": must be add, change, clear, event, info, keep, nextid, or redo}
 
+# cleanup
+::tcltest::cleanupTests
+return
+
+
+
+
+
+
+
+
+
+
+
+