Clean up test.output.* references

test.output.* files are no longer created by the system test framework.
Remove all references to these files from the source tree.

diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index d41de04dd447d4a43ccc0417228e9a59e094d0bb..cff1aa39fd4b81ee81706cb3884f0fbf14ac4f33 100644 (file)
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -8,7 +8,6 @@ named.lock
 named.pid
 named.run
 /feature-test
-/test.output.*
 /makejournal
 /random.data
 /*.log

diff --git a/bin/tests/system/README b/bin/tests/system/README
index b4d64dd7ffae53708ad0e2daa3489ebd45cace0b..ffc3a900cbf1c4490bf7cd2f0afcee8923982dfb 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -641,10 +641,6 @@ stored in the test directory.
 2. Files produced by named which may not be cleaned up if named exits
 abnormally, e.g. core files, PID files etc., are stored in the test directory.
 
-3. A file "test.output.<test-name>" containing the text written to stdout by the
-test is written to bin/tests/system/.  This file is only produced when the test
-is run as part of the entire test suite (e.g. via make).
-
 If the test fails, all these files are retained.  But if the test succeeds,
 they are cleaned up at different times:
 
@@ -653,7 +649,3 @@ they are cleaned up at different times:
 
 2. Files that may not be cleaned up if named exits abnormally can be removed
 using the "cleanall.sh" script.
-
-3. "test.output.*" files are deleted when the test suite ends.  At this point,
-the file "testsummary.sh" is called which concatenates all the "test.output.*"
-files into a single "systests.output" file before deleting them.

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 79a8434b3e6641e90ee469bc7b136ba34c8f18ef..5fafffd2033071cfbbf808fcc065ab42a8b545b5 100644 (file)
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -31,6 +31,5 @@ rm -f ../random.data
 for d in $SUBDIRS
 do
    test ! -f $d/clean.sh || ( cd $d && $SHELL clean.sh )
-   rm -f test.output.$d
    test -d $d && find $d -type d -exec rmdir '{}' \; 2> /dev/null
 done