Remove local and dead files.

5 files changed, 0 insertions, 824 deletions

diff --git a/tk/Makefile.in b/tk/Makefile.in
deleted file mode 100644
index ada985112aa..00000000000
--- a/tk/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-# Minimal top-level Makefile.  Just pass everything to the $(CONFIGDIR)
-# subdir.
-# Tom Tromey <tromey@cygnus.com>
-
-CONFIGDIR=@CONFIGDIR@
-
-VPATH = @srcdir@
-SHELL = @SHELL@
-srcdir = @srcdir@
-
-@SET_MAKE@
-
-all install install-binaries install-libraries install-minimal:
-	@cd $(CONFIGDIR) && $(MAKE) $@
-
-# Nothing for these yet.
-installcheck install-info info:
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@cd $(CONFIGDIR) && $(MAKE) `echo $@ | sed 's/-recursive//'`
-
-# Don't depend on configure.in, because we can't ensure that the user
-# has autoconf.
-configure:
-	cd $(srcdir) ; autoconf
-
-mostlyclean: mostlyclean-recursive
-
-clean: clean-recursive
-
-distclean-local:
-	rm -f Makefile config.status config.cache config.log
-
-distclean: distclean-recursive distclean-local
-
-maintainer-clean: distclean-local maintainer-clean-recursive
-
-Makefile: Makefile.in config.status
-	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-#----------------------------------------------------------------
-# These let the DejaGnu test suite run when DejaGnu isn't 
-# installed yet, so run it from the srcdir and objdir.
-#----------------------------------------------------------------
-EXPECT = ` \
-  if [ -f $${rootme}/../expect/expect ] ; then \
-    echo $${rootme}/../expect/expect ; \
-  else echo expect ; fi`
-
-RUNTESTFLAGS =
-RUNTEST = ` \
-  if [ -f $(srcdir)/../dejagnu/runtest ] ; then \
-    echo $(srcdir)/../dejagnu/runtest ; \
-  else echo runtest ;  fi`
-
-check:
-	cd $(CONFIGDIR) && $(MAKE) tktest
-	rootme=`pwd`; export rootme; \
-	srcdir=${srcdir}; export srcdir ; \
-	EXPECT=${EXPECT} ; export EXPECT ; \
-	if [ -f $${rootme}/../expect/expect ] ; then  \
-	   TCL_LIBRARY=`cd $${srcdir}/../tcl/library && pwd`; \
-	   export TCL_LIBRARY; \
-	   TK_LIBRARY=`cd $${srcdir}/library && pwd`; \
-	   export TK_LIBRARY; \
-	fi ; \
-	$(RUNTEST) $(RUNTESTFLAGS) --tool tk --srcdir $(srcdir)/testsuite
diff --git a/tk/ToDo b/tk/ToDo
deleted file mode 100644
index 683dc804260..00000000000
--- a/tk/ToDo
+++ /dev/null
@@ -1,90 +0,0 @@
-This file contains a list of bugs to fix and minor feature changes
-needed in the Tk toolkit.  The list is ordered by the time when the
-idea for the change first arose;  no priority should be inferred from
-the order.
-
-sccsid = SCCS: @(#) ToDo 1.8 96/02/16 10:55:14
-
-106. Add feature to buttons for automatic defaulting, where button
-allocates extra space for default ring.
-
-136. Implement mechanism for using existing window as main window for
-application, support with command-line argument in wish.
-
-139. Change canvas Postscript generation to be smarter about font names
-that have been abbreviated:  use X to look up the full name.
-
-147. Add "window" entry to menus.
-
-148. Add an "initProc" and a "freeProc" to TK_CONFIG_CUSTOM config types.
-
-150. In SYNONYM options, specify a command-line switch for the other
-option, not a database name.
-
-153. Some fonts (e.g. Times) have underline characters that extend
-*below* the official descent of the font.  Right now the underline
-is invisible for these fonts in text widgets.  Find a way to make
-this work in text?
-
-150. Change the bindings for menubuttons to watch mouse motion events
-and map them to menu or menubutton windows "by hand", so as to eliminate
-the need for a menu to be a descendant of the menubutton.
-
-151. Create an I/O event handler so that Tk can continue after a server
-connection is lost.
-
-153. Allow Tk applications to be embedded inside other Tk applications:
-    - Allow the window for a widget to be specified explicitly, rather
-      than being created automatically by Tk.  This would allow the
-      main window for one application to use an internal window that
-      already exists in another application.
-    - Modify wish's main.c to allow a window id for the main window to
-      be specified as a command-line argument.
-    - Build a special widget for embedding other applications, which will
-      implement the window-manager side of the ICCCM protocols, e.g.,
-      feeding requested size information up from the embedded application
-      into the enclosing widget hierarchy.
-
-154. Improvements to canvases:
-    - Allow items to be rotated?
-    - Allow polygons to be outlined.
-    - Make "raise" of window items work correctly.
-    - In the "find" widget option, make it possible to restrict search
-      to a particular tag.
-    - Allow items to become visible/invisible.
-
-156. Add a "wm anchor" option to make it easier to center windows.
-
-157. Various improvements to option database:
-    - Allow patterns to be read from database or deleted from database.
-    - Allow database to be cleared without automatically reloading from
-      .Xdefaults files.
-    - Allow additional info to be read from various window properties.
-    - Support new wildcards from X11R5.
-    - Allow mechanism to extend to cover cases where there isn't even
-      a window, or even an application by the name used in the option
-      get command.
-    - Allow options in database to override those specified on Tcl
-      command lines?
-    - Revert to X conflict-resolution scheme?
-
-158. Make it possible for wish to run without a display.
-
-159. Change option tables to be arrays of pointers, rather than arrays of
-entries?  Makes it easier to keep separate named structures for particular
-options, e.g. so that you can tell when an option has changed.
-
-160. Change text scrolling so that the top of the window can fall in
-the middle of a text line.
-
-161. Allow text tabs to be specified in units of characters, rather
-than just inches.
-
-162. Fix tk_strictMotif to make it easier to turn on and off (e.g.
-conditionalize the binding scripts, rather than the creation of
-the bindings).
-
-163. Change text bindings so that Enter and Leave events occur when
-the mouse moves between disjoint ranges with the same tag.
-
-164. Provide block insertion cursor in text widgets.
diff --git a/tk/cygtcl.m4 b/tk/cygtcl.m4
deleted file mode 100644
index b74c2be7aca..00000000000
--- a/tk/cygtcl.m4
+++ /dev/null
@@ -1,310 +0,0 @@
-# CYGNUS LOCAL
-#
-# This entire file is Cygnus local, it contains a set of cross
-# platform autoconf macros to be used by Tcl extensions.
-
-# FIXME: There seems to be a problem with variable
-# names that still need an expansion (like $foo_FILE)
-# since another eval might be needed in these macros.
-
-#--------------------------------------------------------------------
-# TCL_TOOL_PATH
-#
-#	Return a file path that the build system tool will understand.
-#	This path might be different than the path used in the
-#	Makefiles.
-#
-# Arguments:
-#	
-#	VAR
-#	PATH
-#	
-# Results:
-#
-#
-# Example:
-#
-# TCL_TOOL_PATH(TCL_CC_PATH, /usr/local/compiler)
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_PATH, [
-  val=$2
-
-  if test "$val" = "" ; then
-    AC_MSG_ERROR([Empty value for variable $1])
-  fi
-
-  case "${host}" in
-    *windows32* | *mingw32*)
-      if test "${CYGPATH}" = ""; then
-        AC_MSG_ERROR([CYGPATH variable is not defined.])
-      elif test "${CYGPATH}" = "echo"; then
-        # No cygpath when cross compiling
-        $1=$val
-      else
-        # store literal argument text in a variable
-        val=$val
-        # Convert Cygwin to Windows path (/tmp/foo -> C:\Tmp\foo)
-        val="`${CYGPATH} $val`"
-        # Convert path like C:\Tmp\foo to C:/Tmp/foo
-        $1="`echo $val | sed -e s#\\\\\\\\#/#g`"
-      fi
-    ;;
-    *)
-      # Default to a no-op under Unix or Cygwin gcc
-      $1=$val
-    ;;
-  esac
-])
-
-# FIXME: It would simplify things if no SUFFIX had to be passed
-# into these LONGNAME macros. Using the TCL_SHARED_LIB_SUFFIX
-# and TCL_UNSHARED_LIB_SUFFIX from tclConfig.sh might do the trick!
-
-#--------------------------------------------------------------------
-# TCL_TOOL_STATIC_LIB_LONGNAME
-#
-#	Return static library name in the "long format" understood by
-#	the build tools. This might involve prepending a suffix
-#	and appending version information to the library name.
-#
-# Arguments:
-#	
-#	VAR
-#	LIBNAME
-#	SUFFIX
-#	
-# Depends on:
-#	TCL_DBGX
-#	TCL_VENDOR_PREFIX
-#
-# Example:
-#
-# TCL_TOOL_STATIC_LIB_LONGNAME(TCL_LIB, tcl, $TCL_UNSHARED_LIB_SUFFIX)
-#
-# Results:
-#
-#	TCL_LIB=libtcl83.a
-#
-#	or
-#
-#	TCL_LIB=tcl83.lib
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_STATIC_LIB_LONGNAME, [
-  libname=$2
-  suffix=$3
-
-  case "${host}" in
-    *windows32* | *mingw32*)
-      if test "$GCC" != yes; then
-        eval "long_libname=\"${TCL_VENDOR_PREFIX}${libname}${suffix}\""
-      else
-        eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\""
-      fi
-    ;;
-    *)
-      eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\""
-    ;;
-  esac
-
-  eval "long_libname=${long_libname}"
-
-  # Trick to replace DBGX with TCL_DBGX
-  DBGX='${TCL_DBGX}'
-  eval "long_libname=${long_libname}"
-
-  $1=$long_libname
-])
-
-#--------------------------------------------------------------------
-# TCL_TOOL_SHARED_LIB_LONGNAME
-#
-#	Return the shared library name in the "long format" understood by
-#	the build tools. This might involve prepending a suffix
-#	and appending version information to the shared library name.
-#
-# Arguments:
-#	
-#	VAR
-#	LIBNAME
-#	SUFFIX
-#	
-# Depends on:
-#	TCL_DBGX
-#	TCL_VENDOR_PREFIX
-#
-# Example:
-#
-# TCL_TOOL_SHARED_LIB_LONGNAME(TCL_SHLIB, tcl, $TCL_SHARED_LIB_SUFFIX)
-#
-# Results:
-#	The above example could result in the following.
-#
-#	TCL_SHLIB=libtcl83.so
-#
-#	or
-#
-#	TCL_SHLIB=tcl83.dll
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_SHARED_LIB_LONGNAME, [
-  libname=$2
-  suffix=$3
-
-  case "${host}" in
-    *windows32* | *mingw32* | *cygwin*)
-      eval "long_libname=\"${TCL_VENDOR_PREFIX}${libname}${suffix}\""
-    ;;
-    *)
-      eval "long_libname=\"lib${TCL_VENDOR_PREFIX}${libname}${suffix}\""
-    ;;
-  esac
-
-  eval "long_libname=${long_libname}"
-
-  # Trick to replace DBGX with TCL_DBGX
-  DBGX='${TCL_DBGX}'
-  eval "long_libname=${long_libname}"
-
-  $1=$long_libname
-])
-
-#--------------------------------------------------------------------
-# TCL_TOOL_LIB_SHORTNAME
-#
-#	Return the library name in the "short format" understood by
-#	the build tools. This might involve prepending a suffix
-#	and appending version information to the library name.
-#	The VC++ compiler does not support short library names
-#	so we just use the static import lib name in that case.
-#
-# Arguments:
-#	
-#	VAR
-#	LIBNAME
-#	VERSION
-#	
-# Depends on:
-#	TCL_LIB_VERSIONS_OK
-#	TCL_DBGX
-#	SHARED_BUILD
-#	
-#
-# Example:
-#
-# TCL_TOOL_LIB_SHORTNAME(TCL_LIB, tcl, 8.3)
-#
-# Results:
-#	The above example could result in the following.
-#
-#	TCL_LIB=-ltcl83
-#
-#	or
-#
-#	TCL_LIB=tcl83.lib
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_LIB_SHORTNAME, [
-  libname=$2
-  version=$3
-
-  if test "$TCL_LIB_SUFFIX" = "" ; then
-    AC_MSG_ERROR([The TCL_LIB_SUFFIX variable is not defined])
-  fi
-
-  # If the . character is not allowed in lib name, remove it from version
-  if test "${TCL_LIB_VERSIONS_OK}" != "ok"; then
-        version=`echo $version | tr -d .`
-  fi
-
-  case "${host}" in
-    *windows32* | *mingw32*)
-      if test "$GCC" != yes; then
-        eval "short_libname=\"${TCL_VENDOR_PREFIX}${libname}${version}${TCL_LIB_SUFFIX}\""
-      else
-        short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}${TCL_DBGX}"
-      fi
-    ;;
-    *)
-      short_libname="-l${TCL_VENDOR_PREFIX}${libname}${version}\${TCL_DBGX}"
-    ;;
-  esac
-
-  $1=$short_libname
-])
-
-#--------------------------------------------------------------------
-# TCL_TOOL_LIB_SPEC
-#
-#	Return the "lib spec format" understood by the build tools.
-#
-# Arguments:
-#	
-#	VAR
-#	DIR
-#	LIBARG
-#	
-# Depends on:
-#	
-#
-# Example:
-#
-# TCL_TOOL_LIB_SPEC(SPEC, /usr/lib, -ltcl)
-#
-# Results:
-#	The above example could result in the following.
-#
-#	SPEC="-L/usr/lib -ltcl83"
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_LIB_SPEC, [
-  case "${host}" in
-    *windows32* | *mingw32*)
-      if test "$GCC" != yes; then
-        TCL_TOOL_PATH($1, "$2/$3")
-      else
-        TCL_TOOL_PATH(dirname, $2)
-        $1="-L${dirname} $3"
-      fi
-    ;;
-    *)
-      $1="-L$2 $3"
-    ;;
-  esac
-])
-
-#--------------------------------------------------------------------
-# TCL_TOOL_LIB_PATH
-#
-#	Return the "lib path format" understood by the build tools.
-#	Typically, this is the fully qualified path name of the library.
-#
-# Arguments:
-#	
-#	VAR
-#	DIR
-#	LIBARG
-#	
-# Depends on:
-#	
-#
-# Example:
-#
-# TCL_TOOL_LIB_PATH(TMP_PATH, /usr/lib, libtcl83.a)
-#
-# Results:
-#	The above example could result in the following.
-#
-#	TMP_PATH="/usr/lib/libtcl83.a"
-#
-#--------------------------------------------------------------------
-
-AC_DEFUN(TCL_TOOL_LIB_PATH, [
-  TCL_TOOL_PATH($1, "$2/$3")
-])
diff --git a/tk/testsuite/config/default.exp b/tk/testsuite/config/default.exp
deleted file mode 100644
index 37d8af5b8a0..00000000000
--- a/tk/testsuite/config/default.exp
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright (C) 1996 Cygnus Support
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Tom Tromey <tromey@cygnus.com>
-
-set testdrv "unix/tktest"
-set tprompt "%"
-
-#
-# Extract and print the version number of wish.
-#
-proc tk_version {} {
-  global testdrv
-  if {! [catch {exec $testdrv -version} output]
-      && ! [regsub {^.*version } $output {} version]} then {
-    clone_output "Tk library is version\t$version\n"
-  }
-}
-
-#
-# Source a file.
-#
-proc tk_load {file} {
-  global subdir testdrv spawn_id
-
-  if {! [file exists $file]} then {
-    perror "$file does not exist."
-    return -1
-  }
-
-  verbose "Sourcing $file..."
-  send "source $file\n"
-  return 0
-}
-
-#
-# Exit the test driver.
-#
-proc tk_exit {} {
-  # If we started Xvfb, we should kill it.  This doesn't happen right
-  # now, so this proc does nothing.
-  # xvfb_exit
-}
-
-#
-# Find X display to use.  Return 0 if not found.  Set DISPLAY
-# environment variable if display found.
-#
-proc find_x_display {} {
-  global env
-
-  if {[info exists env(TEST_DISPLAY)]} then {
-    set env(DISPLAY) $env(TEST_DISPLAY)
-    return 1
-  }
-
-  return 0
-}
-
-#
-# Start the test driver.
-#
-proc tk_start {} {
-  global testdrv objdir subdir srcdir spawn_id tprompt
-
-  set testdrv "$objdir/$testdrv"
-  set defs "$srcdir/../tests/defs"
-
-  set timeout 100
-  set timetol 0
-
-  if {! [find_x_display]} then {
-      return -1
-  }
-
-  spawn $testdrv
-
-  if ![file exists ${srcdir}/../tests] {
-    perror "The source for the test cases is missing." 0
-    return -1
-  }
-
-  send "[list set srcdir ${srcdir}/../tests]\r"
-  expect {
-    -re "set VERBOSE 1\[\r\n\]*1\[\r\n\]*%" {
-      verbose "Set verbose flag for tests"
-      exp_continue
-    }
-    -re "${srcdir}/../tests\[\r\n\]*$tprompt" {
-      verbose "Set srcdir to $srcdir/../tests" 2
-    }
-    -re "no files matched glob pattern" {
-      warning "Didn't set srcdir to $srcdir/../tests"
-    }
-    timeout {
-      perror "Couldn't set srcdir"
-      return -1
-    }
-  }
-
-  if ![file exists $defs] then {
-    perror "$defs does not exist."
-    return -1
-  }
-
-  verbose "Sourcing $defs..."
-  send "source $defs\r\n"
-  
-  expect {
-    -re ".*source $defs.*$" {
-      verbose "Sourced $defs"
-    }
-    "Error: couldn't read file*" {
-      perror "Couldn't source $defs"
-      return -1
-    }
-    "%" {
-      verbose "Got prompt, sourced $defs"
-    }
-    timeout {
-      warning "Timed out sourcing $defs."
-      if { $timetol <= 3 } {
-	incr timetol
-	exp_continue
-      } else {
-	return -1
-      }
-    }
-  }
-
-  set timetol 0
-  sleep 2
-  send "set VERBOSE 1\n"
-  expect {
-    -re "% 1.*%" {
-      verbose "Set verbose flag for tests"
-    }
-    -re "set VERBOSE 1.*1.*%" {
-      verbose "Set verbose flag for tests"
-    }
-    timeout {
-      perror "Timed out setting verbose flag."
-      if { $timetol <= 3 } {
-	exp_continue
-      } else {
-	return -1
-      }
-    }
-  }
-  return $spawn_id
-}
-
-################################################################
-#
-# Utility functions.
-#
-
-proc read_file {name} {
-  set id [open $name r]
-  set contents [read $id]
-  close $id
-  return $contents
-}
-
-proc write_file {name contents} {
-  set id [open $name w]
-  puts -nonewline $id $contents
-  close $id
-}
-
-# NOTE that this fails to copy files with NULs in them.  Change
-# implementation to "exec cp" if required.
-proc copy_file {from to} {
-  write_file $to [read_file $from]
-}
-
-################################################################
-#
-# Start/stop Xvfb.  These procs aren't used right now; we assume Xvfb
-# is already running.
-#
-
-#
-# Stop Xvfb.
-#
-proc xvfb_exit {} {
-  global Xvfb_spawn_id
-
-  # Send C-c to kill it.
-  send -i $Xvfb_spawn_id "\003"
-}
-
-#
-# Start Xvfb.  Return 0 on error, 1 if started.  Set DISPLAY
-# environment variable on successful start.
-# 
-#
-proc xvfb_start {} {
-  global spawn_id Xvfb_spawn_id Xvfb_screen env
-
-  # FIXME should look for Xvfb in build directory.  Do this later,
-  # when we actually build Xvfb.
-
-  set Xvfb [which Xvfb]
-  # Why "0"?  I don't know, but that is what the manual says.
-  if {$Xvfb == 0} then {
-    perror "Couldn't find Xvfb"
-    return 0
-  }
-  verbose "Xvfb is $Xvfb"
-
-  # Pick a number at random...
-  set Xvfb_screen 23
-
-  while {$Xvfb_screen < 100} {
-    spawn $Xvfb :$Xvfb_screen
-
-    expect {
-      "Server is already active" {
-	incr Xvfb_screen
-      }
-
-      timeout {
-	break
-      }
-    }
-  }
-
-  if {$Xvfb_screen == 100} then {
-    perror "Xvfb screen is 100!"
-    return 0
-  }
-
-  set Xvfb_spawn_id $spawn_id
-  set env(DISPLAY) :$Xvfb_screen
-  verbose "Screen is :$Xvfb_screen"
-  return 1
-}
diff --git a/tk/testsuite/tk.tests/tk-test.exp b/tk/testsuite/tk.tests/tk-test.exp
deleted file mode 100644
index fd8562a1674..00000000000
--- a/tk/testsuite/tk.tests/tk-test.exp
+++ /dev/null
@@ -1,99 +0,0 @@
-#   Copyright (C) 1996 Cygnus Support
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Tom Tromey <tromey@cygnus.com>
-
-if {$tracelevel} then {
-  strace $tracelevel
-}
-
-if {[tk_start] == -1} then {
-  perror "Couldn't start the Tk test environment" 0
-  return -1
-}
-
-# This file is needed by the Tk test suite.
-copy_file $srcdir/../tests/README README
-
-set timeoutmsg "Timed out: Never got started, "
-set timeout 100
-set file all
-set timetol 0
-
-#
-# Change to the dir where all the tests live.
-#
-
-set timetol 0
-if {! [file exists ${srcdir}/../tests/${file}]} then {
-  perror "The source for the test case \"$file\" is missing" 0
-  return -1
-}
-send "source \$srcdir/${file}\n"
-expect {
-  -re "source \$srcdir/$file\[\r\n\]+\[$tprompt\]*" {
-    verbose "Sourced test $file ..."
-    set timeoutmsg "Never got to the end of "
-    exp_continue
-  }
-  "install Tcl or set your TCL_LIBRARY environment variable" {
-    perror "You need to set the TCL_LIBRARY environment variable"
-    return -1
-  }
-  -re "\[\r\n\]*\\+\\+\\+\\+ (\[a-zA-Z\]*-\[.0-9\]*) PASSED\[\r\n\]*" {
-    pass $expect_out(1,string)
-    set timetol 0
-    exp_continue
-  }
-  -re "\[\r\n\]*\\+* (\[a-zA-Z\]*-\[.0-9\]*) FAILED\[\r\n\]*" {
-    fail $expect_out(1,string)
-    exp_continue
-  }
-  -re "\[x\]+ \[a-i\]+ \[A-K\]+ \[0-9\]+ " {
-    verbose "Got standard output message from exec 8.1 test." 3
-    exp_continue
-  }
-  -re "Test generated error:\[\r\n\]*.*\[\r\n\]*" {
-    regsub "Test generated error:\[\r\n\]*" $expect_out(0,string) "" tmp
-    regsub -all "\[\r\n\]*\[a-zA-Z.\]test\[\r\n\]*" $tmp "" tmp
-    regsub -all "\[\r\n\]*" $tmp "" tmp
-    perror "Got a test case bug \"$tmp\""
-    exp_continue
-  }
-  "Tests all done" {
-    verbose "Done" 2
-  }
-  "*Error: bad option *" {
-    fail "Got a bad option"
-  }
-  eof {
-    verbose "Done" 2
-  }
-  timeout {
-    warning "Timed out executing test case"
-    if { $timetol <= 2 } {
-      incr timetol
-      exp_continue
-    } else {
-      return -1
-    }
-  }
-}
-
-catch close