* lib/utils.exp (slay): Remove proc.

	* doc/ref.xml: Update documentation.
	* doc/dejagnu.texi: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index e829271..4cc605b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-02-20  Ben Elliston  <bje@gnu.org>
 
+       * lib/utils.exp (slay): Remove proc.
+       * doc/ref.xml: Update documentation.
+       * doc/dejagnu.texi: Regenerate.
+
+2016-02-20  Ben Elliston  <bje@gnu.org>
+
        * lib/utils.exp (absolute): Remove proc.
        * doc/ref.xml: Update documentation.
        * doc/dejagnu.texi: Regenerate.

diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 0b7cf17..99dd8f1 100644 (file)
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -5413,7 +5413,6 @@ tool, and its version number.
 * Which Procedure: which procedure.
 * Grep Procedure: grep procedure.
 * Prune Procedure: prune procedure.
-* Slay Procedure: slay procedure.
 * Runtest_file_p Procedure: runtest_file_p procedure.
 * Diff Procedure: diff procedure.
 * Setenv Procedure: setenv procedure.
@@ -5537,7 +5536,7 @@ Prefix the line number to each line where the
 regexp matches.
 @end table
 
-@node prune procedure, slay procedure, grep procedure, Utility Procedures
+@node prune procedure, runtest_file_p procedure, grep procedure, Utility Procedures
 @subsubsection Prune Procedure
 
 This procedure is deprecated and will be removed in
@@ -5545,15 +5544,7 @@ the next release of DejaGnu.  If a testsuite uses this
 procedure, a copy of the procedure should be made and placed
 in the lib directory of the testsuite.
 
-@node slay procedure, runtest_file_p procedure, prune procedure, Utility Procedures
-@subsubsection Slay Procedure
-
-This procedure is deprecated and will be removed in
-the next release of DejaGnu.  If a testsuite uses this
-procedure, a copy of the procedure should be made and placed
-in the lib directory of the testsuite.
-
-@node runtest_file_p procedure, diff procedure, slay procedure, Utility Procedures
+@node runtest_file_p procedure, diff procedure, prune procedure, Utility Procedures
 @subsubsection Runtest_file_p Procedure
 
 Search @emph{runtest}s for

diff --git a/doc/ref.xml b/doc/ref.xml
index b8503ab..05013ae 100644 (file)
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -3586,14 +3586,6 @@
          in the lib directory of the testsuite.</para>
        </sect4>
 
-       <sect4 id="slay" xreflabel="slay procedure">
-         <title>Slay Procedure</title>
-         <para>This procedure is deprecated and will be removed in
-         the next release of &dj;.  If a testsuite uses this
-         procedure, a copy of the procedure should be made and placed
-         in the lib directory of the testsuite.</para>
-       </sect4>
-
        <sect4 id="runtestfilep" xreflabel="runtest_file_p procedure">
          <title>Runtest_file_p Procedure</title>
 

diff --git a/lib/utils.exp b/lib/utils.exp
index 471109e..24f2591 100644 (file)
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -220,23 +220,6 @@ proc prune { list pattern } {
     return $tmp
 }
 
-#
-# Attempt to kill a process that you started on the local machine.
-#
-proc slay { name } {
-    set in [open [concat "|ps"] r]
-    while {[gets $in line]>-1} {
-       if {![string match "*expect*slay*" $line]} {
-           if {[string match "*$name*" $line]} {
-               set pid [lindex $line 0]
-               catch "exec kill -9 $pid"
-               verbose "Killing $name, pid = $pid\n"
-           }
-       }
-    }
-    close $in
-}
-
 
 # Check if a testcase should be run or not
 #