From 54f20a63a44f26030afc51fc6abeeeb0f4a22598 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@gnu.org>
Date: Wed, 9 Mar 2011 11:51:01 +1100
Subject: 	* Makefile.am (DISTCLEANFILES): Define. 	* Makefile.in:
 Regenerate. 	* testsuite/runtest.all/libs.exp: Clean up temp files on exit.
 	* testsuite/runtest.all/options.exp: Likewise for dbg.log. 	*
 testsuite/runtest.all/stats.exp: Likewise for tmpdir. Use "file 	mkdir"
 instead of exec'ing mkdir(1).

---
 ChangeLog                         | 9 +++++++++
 Makefile.am                       | 2 ++
 Makefile.in                       | 2 ++
 testsuite/runtest.all/libs.exp    | 3 +++
 testsuite/runtest.all/options.exp | 3 +++
 testsuite/runtest.all/stats.exp   | 4 +++-
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c3513c4..8d091bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-09  Ben Elliston  <bje@gnu.org>
+
+	* Makefile.am (DISTCLEANFILES): Define.
+	* Makefile.in: Regenerate.
+	* testsuite/runtest.all/libs.exp: Clean up temp files on exit.
+	* testsuite/runtest.all/options.exp: Likewise for dbg.log.
+	* testsuite/runtest.all/stats.exp: Likewise for tmpdir. Use "file
+	mkdir" instead of exec'ing mkdir(1).
+
 2011-03-07  Ben Elliston  <bje@gnu.org>
 
 	* Makefile.am (doc/dejagnu.texi): Conditional on MAINTAINER_MODE.
diff --git a/Makefile.am b/Makefile.am
index 0709489..e9c6524 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest site.tmpl \
 	$(baseboard_DATA) $(baseboard_SCRIPTS) \
 	$(TESTSUITE_FILES) $(XML) $(CONTRIB)
 
+DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log testrun.sum
+
 bin_SCRIPTS = runtest
 include_HEADERS = dejagnu.h
 
diff --git a/Makefile.in b/Makefile.in
index a0b24d9..9f9fdab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -248,6 +248,7 @@ EXTRA_DIST = ChangeLog-1992 MAINTAINERS runtest site.tmpl \
 	$(baseboard_DATA) $(baseboard_SCRIPTS) \
 	$(TESTSUITE_FILES) $(XML) $(CONTRIB)
 
+DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log testrun.sum
 bin_SCRIPTS = runtest
 include_HEADERS = dejagnu.h
 pkgdata_SCRIPTS = \
@@ -1233,6 +1234,7 @@ distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f doc/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/testsuite/runtest.all/libs.exp b/testsuite/runtest.all/libs.exp
index 5fc1aeb..d9e621d 100644
--- a/testsuite/runtest.all/libs.exp
+++ b/testsuite/runtest.all/libs.exp
@@ -84,3 +84,6 @@ make_defaults_file [pwd]/setval.tmp
 foreach i [glob $srcdir/$subdir/*.test] {
     process_test $i
 }
+
+# Clean up behind ourselves.
+file delete .tmp [pwd]/setval.tmp
diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp
index 0bfcfec..7dd8d7e 100644
--- a/testsuite/runtest.all/options.exp
+++ b/testsuite/runtest.all/options.exp
@@ -89,3 +89,6 @@ if [file exists $objdir/x.sum] {
 if [file exists $objdir/xXx.sum] {
     exec rm -f $objdir/xXx.*
 }
+if [file exists dbg.log] {
+    file delete dbg.log
+}
diff --git a/testsuite/runtest.all/stats.exp b/testsuite/runtest.all/stats.exp
index 1ca78a1..decac7c 100644
--- a/testsuite/runtest.all/stats.exp
+++ b/testsuite/runtest.all/stats.exp
@@ -28,7 +28,7 @@ if ![info exists tmpdir] {
 }
 
 if ![file isdirectory $tmpdir] {
-    catch "exec mkdir $tmpdir"
+    catch "file mkdir $tmpdir"
 }
 
 set tests {
@@ -53,3 +53,5 @@ foreach t $tests {
 	pass [lindex $t 0]
     }
 }
+
+file delete -force $tmpdir
-- 
cgit v1.1