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

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

diff --git a/ChangeLog b/ChangeLog
index 9f8adb0..82f5520 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-02-20  Ben Elliston  <bje@gnu.org>
 
+       * lib/utils.exp (psource): Remove proc.
+       * doc/ref.xml: Update documentation.
+       * doc/dejagnu.texi: Regenerate.
+
+2016-02-20  Ben Elliston  <bje@gnu.org>
+
        * lib/targetdb.exp (board_info): Simplify return logic.
 
 2016-02-19  Ben Elliston  <bje@gnu.org>

diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 1739b01..f57319d 100644 (file)
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -5415,7 +5415,6 @@ tool, and its version number.
 * Prune Procedure: prune procedure.
 * Slay Procedure: slay procedure.
 * Absolute Procedure: absolute procedure.
-* Psource Procedure: psource procedure.
 * Runtest_file_p Procedure: runtest_file_p procedure.
 * Diff Procedure: diff procedure.
 * Setenv Procedure: setenv procedure.
@@ -5555,7 +5554,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 absolute procedure, psource procedure, slay procedure, Utility Procedures
+@node absolute procedure, runtest_file_p procedure, slay procedure, Utility Procedures
 @subsubsection Absolute Procedure
 
 This procedure is deprecated and will be removed in
@@ -5563,15 +5562,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 psource procedure, runtest_file_p procedure, absolute procedure, Utility Procedures
-@subsubsection Psource 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, psource procedure, Utility Procedures
+@node runtest_file_p procedure, diff procedure, absolute procedure, Utility Procedures
 @subsubsection Runtest_file_p Procedure
 
 Search @emph{runtest}s for

diff --git a/doc/ref.xml b/doc/ref.xml
index 1268bf2..021a63d 100644 (file)
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -3602,14 +3602,6 @@
          in the lib directory of the testsuite.</para>
        </sect4>
 
-       <sect4 id="psource" xreflabel="psource procedure">
-         <title>Psource 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 a01d306..0002851 100644 (file)
--- a/lib/utils.exp
+++ b/lib/utils.exp
@@ -252,27 +252,7 @@ proc absolute { path } {
     return $path
 }
 
-#
-# Source a file and trap any real errors. This ignores extraneous
-# output. returns a 1 if there was an error, otherwise it returns 0.
-#
-proc psource { file } {
-    global errorInfo
-    global errorCode
 
-    unset errorInfo
-    if {[file exists $file]} {
-       catch "source $file"
-       if {[info exists errorInfo]} {
-           send_error "ERROR: errors in $file\n"
-           send_error "$errorInfo"
-           return 1
-       }
-    }
-    return 0
-}
-
-#
 # Check if a testcase should be run or not
 #
 # RUNTESTS is a copy of global `runtests'.