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

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

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

diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 99dd8f1..bff10cf 100644 (file)
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -5412,7 +5412,6 @@ tool, and its version number.
 * Find Procedure: find procedure.
 * Which Procedure: which procedure.
 * Grep Procedure: grep procedure.
-* Prune Procedure: prune procedure.
 * Runtest_file_p Procedure: runtest_file_p procedure.
 * Diff Procedure: diff procedure.
 * Setenv Procedure: setenv procedure.
@@ -5499,7 +5498,7 @@ The executable program or shell script to look
 for.
 @end table
 
-@node grep procedure, prune procedure, which procedure, Utility Procedures
+@node grep procedure, runtest_file_p procedure, which procedure, Utility Procedures
 @subsubsection Grep Procedure
 
 Search the file called @file{filename} (a fully
@@ -5536,15 +5535,7 @@ Prefix the line number to each line where the
 regexp matches.
 @end table
 
-@node prune procedure, runtest_file_p procedure, grep procedure, Utility Procedures
-@subsubsection Prune 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, prune procedure, Utility Procedures
+@node runtest_file_p procedure, diff procedure, grep procedure, Utility Procedures
 @subsubsection Runtest_file_p Procedure
 
 Search @emph{runtest}s for

diff --git a/doc/ref.xml b/doc/ref.xml
index 05013ae..b1329e0 100644 (file)
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -3578,14 +3578,6 @@
        </variablelist>
        </sect4>
 
-       <sect4 id="prune" xreflabel="prune procedure">
-         <title>Prune 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 24f2591..cb8c1e9 100644 (file)
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -201,25 +201,6 @@ proc grep { args } {
     return $grep_out
 }
 
-#
-# Remove elements based on patterns. elements are delimited by spaces.
-# pattern is the pattern to look for using glob style matching
-# list is the list to check against
-# returns the new list
-#
-proc prune { list pattern } {
-    set tmp {}
-    foreach i $list {
-       verbose "Checking pattern \"$pattern\" against $i" 3
-       if {![string match $pattern $i]} {
-           lappend tmp $i
-       } else {
-           verbose "Removing element $i from list" 3
-       }
-    }
-    return $tmp
-}
-
 
 # Check if a testcase should be run or not
 #