* library/tcltest1.0/tcltest2.tcl:

* tests/tcltest2.test
* doc/tcltest2.n: Code and documentation cleanup.  Modified
  -verbose to take list of keywords as well as string of letters.
  Removed Tcl version information from tcltest. Removed
  tcltest::grep from tcltest package. Added optional 3rd directory
  argument to  makeFile/makeDirectory and removeFile/removeDirectory.

* tests/basic.test: Changed references to tcltest::tclVersion to
  hardcoded numbers.
* generic/tcl.h: Changed reference to tcltest2.tcl and tcltest.tcl
  in comments to tests/basic.test.

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/basic.test b/tests/basic.test
index b30f705..cb97c24 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -15,7 +15,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: basic.test,v 1.10 2000/04/10 17:18:57 ericm Exp $
+# RCS: @(#) $Id: basic.test,v 1.11 2000/10/19 18:01:00 jenn Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -23,6 +23,10 @@ if {[lsearch [namespace children] ::tcltest] == -1} {
     namespace import -force ::tcltest::*
 }
 
+# This variable needs to be changed when the major or minor version number for
+# Tcl changes.
+set tclvers 8.4
+
 catch {namespace delete test_ns_basic}
 catch {interp delete test_interp}
 catch {rename p ""}
@@ -494,10 +498,10 @@ test basic-39.1 {Tcl_CreateTrace, correct command and argc/argv arguments of tra
 } {{expr 14 + 16} {expr 14 + 16} {set stuff [expr 14 + 16]} {set stuff 30}}
 test basic-39.2 {Tcl_CreateTrace, correct command and argc/argv arguments of trace proc} {
     testcmdtrace tracetest {set stuff [info tclversion]}
-} [list {info tclversion} {info tclversion} {set stuff [info tclversion]} "set stuff $::tcltest::version"]
+} [list {info tclversion} {info tclversion} {set stuff [info tclversion]} "set stuff $tclvers"]
 test basic-39.3 {Tcl_CreateTrace, correct command and argc/argv arguments of trace proc} {
     testcmdtrace deletetest {set stuff [info tclversion]}
-} $::tcltest::version
+} $tclvers
 }
 
 test basic-40.1 {Tcl_DeleteTrace} {emptyTest} {