BIND 10 trac976, updated. 8a83c13c2037e69e64474131916b6c53ececef34 [trac976] Consistently remove temporary files created by the tests

[BIND 10 source code commits]

The branch, trac976 has been updated
       via  8a83c13c2037e69e64474131916b6c53ececef34 (commit)
      from  a9d0e238a2ddfc35c772e2a72a3c73ced70538c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a83c13c2037e69e64474131916b6c53ececef34
Author: Stephen Morris <stephen at isc.org>
Date:   Mon Jun 6 15:31:59 2011 +0100

    [trac976] Consistently remove temporary files created by the tests

-----------------------------------------------------------------------

Summary of changes:
 src/lib/log/tests/console_test.sh.in     |    5 +++--
 src/lib/log/tests/destination_test.sh.in |    3 +++
 src/lib/log/tests/local_file_test.sh.in  |    7 +++----
 src/lib/log/tests/severity_test.sh.in    |    5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/console_test.sh.in b/src/lib/log/tests/console_test.sh.in
index 67ff3a5..bfc178b 100755
--- a/src/lib/log/tests/console_test.sh.in
+++ b/src/lib/log/tests/console_test.sh.in
@@ -55,8 +55,6 @@ rm -f $tempfile
 ./logger_example -c stderr -s error 1> $tempfile
 passfail 0
 
-rm -f $tempfile
-
 if [ $failcount -eq 0 ]; then
     echo "PASS: $testname"
 elif [ $failcount -eq 1 ]; then
@@ -65,4 +63,7 @@ else
     echo "FAIL: $testname - $failcount tests failed"
 fi
 
+# Tidy up
+rm -f $tempfile
+
 exit $failcount
diff --git a/src/lib/log/tests/destination_test.sh.in b/src/lib/log/tests/destination_test.sh.in
index 4a7c2e6..9198184 100755
--- a/src/lib/log/tests/destination_test.sh.in
+++ b/src/lib/log/tests/destination_test.sh.in
@@ -82,4 +82,7 @@ else
     echo "FAIL: $testname - $failcount tests failed"
 fi
 
+# Tidy up.
+rm -f $tempfile $destfile1 $destfile2
+
 exit $failcount
diff --git a/src/lib/log/tests/local_file_test.sh.in b/src/lib/log/tests/local_file_test.sh.in
index 9a388a9..f763192 100755
--- a/src/lib/log/tests/local_file_test.sh.in
+++ b/src/lib/log/tests/local_file_test.sh.in
@@ -72,10 +72,6 @@ rm -f $localmes
 ./logger_example -c stdout -s warn $localmes | cut -d' ' -f3- | diff $tempfile -
 passfail $?
 
-# Tidy up.
-
-rm -f $tempfile
-
 if [ $failcount -eq 0 ]; then
     echo "PASS: $testname"
 elif [ $failcount -eq 1 ]; then
@@ -84,4 +80,7 @@ else
     echo "FAIL: $testname - $failcount tests failed"
 fi
 
+# Tidy up.
+rm -f $tempfile
+
 exit $failcount
diff --git a/src/lib/log/tests/severity_test.sh.in b/src/lib/log/tests/severity_test.sh.in
index 8fe6cc4..7f5c649 100755
--- a/src/lib/log/tests/severity_test.sh.in
+++ b/src/lib/log/tests/severity_test.sh.in
@@ -77,8 +77,6 @@ DEBUG [example.beta] MSG_BADSEVERITY, unrecognized log severity: beta/25
 ./logger_example -c stdout -s debug -d 25 | cut -d' ' -f3- | diff $tempfile -
 passfail $?
 
-rm -f $tempfile
-
 if [ $failcount -eq 0 ]; then
     echo "PASS: $testname"
 elif [ $failcount -eq 1 ]; then
@@ -87,4 +85,7 @@ else
     echo "FAIL: $testname - $failcount tests failed"
 fi
 
+# Tidy up
+rm -f $tempfile
+
 exit $failcount