From 5913a39435cbb508ece0557bd48a5a6cc2b055b2 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Mon, 15 Feb 2016 11:12:17 +1100
Subject: [PATCH] 	* lib/framework.exp (cleanup): Remove do-nothing proc.
 	(log_and_exit): Remove call to cleanup. 	* doc/ref.xml: Remove
 documentation for cleanup. 	* doc/dejagnu.texi: Regenerate.

---
 ChangeLog         |  7 +++++++
 doc/dejagnu.texi  | 14 ++------------
 doc/ref.xml       | 13 -------------
 lib/framework.exp | 13 -------------
 4 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89d8ec8..abccd98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2016-02-15  Ben Elliston  <bje@gnu.org>
 
+	* lib/framework.exp (cleanup): Remove do-nothing proc.
+	(log_and_exit): Remove call to cleanup.
+	* doc/ref.xml: Remove documentation for cleanup.
+	* doc/dejagnu.texi: Regenerate.
+
+2016-02-15  Ben Elliston  <bje@gnu.org>
+
 	Reported by David Malcolm.
 	* lib/dejagnu.exp (text): Allow angle brackets in test messages.
 
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 881006c..1739b01 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -2623,7 +2623,6 @@ DejaGnu provides these Tcl procedures.
 * Reset_vars Procedure: reset_vars procedure.
 * Log_and_exit Procedure: log_and_exit procedure.
 * Log_summary Procedure: log_summary procedure.
-* Cleanup Procedure: cleanup procedure.
 * Setup_xfail Procedure: setup_xfail procedure.
 * Record_test Procedure: record_test procedure.
 * Pass Procedure: pass procedure.
@@ -2831,7 +2830,7 @@ a @emph{1}; otherwise it returns a
 @t{@b{log_and_exit}(@i{});}
 @end quotation
 
-@node log_summary procedure, cleanup procedure, log_and_exit procedure, Core Internal Procedures
+@node log_summary procedure, setup_xfail procedure, log_and_exit procedure, Core Internal Procedures
 @subsubsection Log_summary Procedure
 
 
@@ -2845,16 +2844,7 @@ a @emph{1}; otherwise it returns a
 @item @code{args}
 @end table
 
-@node cleanup procedure, setup_xfail procedure, log_summary procedure, Core Internal Procedures
-@subsubsection Cleanup Procedure
-
-
-@quotation
-
-@t{@b{cleanup}(@i{});}
-@end quotation
-
-@node setup_xfail procedure, record_test procedure, cleanup procedure, Core Internal Procedures
+@node setup_xfail procedure, record_test procedure, log_summary procedure, Core Internal Procedures
 @subsubsection Setup_xfail Procedure
 
 Declares that the test is expected to fail on a particular set
diff --git a/doc/ref.xml b/doc/ref.xml
index ecc7e1d..1268bf2 100644
--- a/doc/ref.xml
+++ b/doc/ref.xml
@@ -265,19 +265,6 @@
 	</variablelist>
 	</sect4>	
 
-	<sect4 id="cleanup" xreflabel="cleanup procedure">
-	  <title>Cleanup Procedure</title>
-
-	  <para></para>
-
-	<funcsynopsis role="tcl">
-          <funcprototype>
-            <funcdef><function>cleanup</function></funcdef>
-	    <paramdef><parameter></parameter></paramdef>
-           </funcprototype>
-        </funcsynopsis>
-	</sect4>
-
 	<sect4 id="setupxfail" xreflabel="setup_xfail procedure">
 	  <title>Setup_xfail Procedure</title>
 
diff --git a/lib/framework.exp b/lib/framework.exp
index a3a6713..b7e73f4 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -365,7 +365,6 @@ proc log_and_exit {} {
 	}
     }
     close_logs
-    cleanup
     verbose -log "runtest completed at [timestamp -format %c]"
     if {$mail_logs} {
 	if { ${tool} ==  "" } {
@@ -463,18 +462,6 @@ proc log_summary { args } {
     }
 }
 
-# Close all open files, remove temp file and core files.
-#
-proc cleanup {} {
-    global sum_file
-    global exit_status
-    global done_list
-    global subdir
-
-    #catch "exec rm -f [glob xgdb core *.x *.o *_soc a.out]"
-    #catch "exec rm -f [glob -nocomplain $subdir/*.o $subdir/*.x $subdir/*_soc]"
-}
-
 # Setup a flag to control whether a failure is expected or not
 #
 # Multiple target triplet patterns can be specified for targets
-- 
2.7.4