BIND 10 trac899, updated. c926e1e8bf4eedc6c999c6ad1a1f0fff96783154 [trac899] Correct output so that tests pass

[BIND 10 source code commits]

The branch, trac899 has been updated
       via  c926e1e8bf4eedc6c999c6ad1a1f0fff96783154 (commit)
      from  192aefd97c825f7636e0885eecef9a5834e53d05 (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 c926e1e8bf4eedc6c999c6ad1a1f0fff96783154
Author: Stephen Morris <stephen at isc.org>
Date:   Thu May 19 20:25:49 2011 +0100

    [trac899] Correct output so that tests pass
    
    With log4cplus, the output format of messages had changed.  This
    corrects the test messages so that the tests passes.

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

Summary of changes:
 src/lib/log/tests/run_time_init_test.sh.in |   42 ++++++++++++++--------------
 1 files changed, 21 insertions(+), 21 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/run_time_init_test.sh.in b/src/lib/log/tests/run_time_init_test.sh.in
index e48a781..eff1b6a 100755
--- a/src/lib/log/tests/run_time_init_test.sh.in
+++ b/src/lib/log/tests/run_time_init_test.sh.in
@@ -37,43 +37,43 @@ cat > $localmes << .
 
 echo -n "1. runInitTest default parameters: "
 cat > $tempfile << .
-FATAL [alpha.example] MSG_WRITERR, error writing to test1: 42
-ERROR [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
-WARN  [alpha.dlm] MSG_READERR, error reading from message file a.txt: dummy reason
-INFO  [alpha.dlm] MSG_OPENIN, unable to open message file example.msg for input: dummy reason
+FATAL - [alpha.example] MSG_WRITERR, error writing to test1: 42
+ERROR - [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
+WARN - [alpha.dlm] MSG_READERR, error reading from message file a.txt: dummy reason
+INFO - [alpha.dlm] MSG_OPENIN, unable to open message file example.msg for input: dummy reason
 .
-./logger_support_test | cut -d' ' -f3- | diff $tempfile -
+./logger_support_test | diff $tempfile -
 passfail $?
 
 echo -n "2. Severity filter: "
 cat > $tempfile << .
-FATAL [alpha.example] MSG_WRITERR, error writing to test1: 42
-ERROR [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
+FATAL - [alpha.example] MSG_WRITERR, error writing to test1: 42
+ERROR - [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
 .
-./logger_support_test -s error | cut -d' ' -f3- | diff $tempfile -
+./logger_support_test -s error | diff $tempfile -
 passfail $?
 
 echo -n "3. Debug level: "
 cat > $tempfile << .
-FATAL [alpha.example] MSG_WRITERR, error writing to test1: 42
-ERROR [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
-WARN  [alpha.dlm] MSG_READERR, error reading from message file a.txt: dummy reason
-INFO  [alpha.dlm] MSG_OPENIN, unable to open message file example.msg for input: dummy reason
-DEBUG [alpha.example] MSG_RDLOCMES, reading local message file dummy/0
-DEBUG [alpha.example] MSG_RDLOCMES, reading local message file dummy/24
-DEBUG [alpha.example] MSG_RDLOCMES, reading local message file dummy/25
+FATAL - [alpha.example] MSG_WRITERR, error writing to test1: 42
+ERROR - [alpha.example] MSG_RDLOCMES, reading local message file dummy/file
+WARN - [alpha.dlm] MSG_READERR, error reading from message file a.txt: dummy reason
+INFO - [alpha.dlm] MSG_OPENIN, unable to open message file example.msg for input: dummy reason
+DEBUG - [alpha.example] MSG_RDLOCMES, reading local message file dummy/0
+DEBUG - [alpha.example] MSG_RDLOCMES, reading local message file dummy/24
+DEBUG - [alpha.example] MSG_RDLOCMES, reading local message file dummy/25
 .
-./logger_support_test -s debug -d 25 | cut -d' ' -f3- | diff $tempfile -
+./logger_support_test -s debug -d 25 | diff $tempfile -
 passfail $?
 
 echo -n "4. Local message replacement: "
 cat > $tempfile << .
-WARN  [alpha.log] MSG_IDNOTFND, could not replace message text for 'MSG_NOTHERE': no such message
-FATAL [alpha.example] MSG_WRITERR, error writing to test1: 42
-ERROR [alpha.example] MSG_RDLOCMES, replacement read local message file, parameter is 'dummy/file'
-WARN  [alpha.dlm] MSG_READERR, replacement read error, parameters: 'a.txt' and 'dummy reason'
+WARN - [alpha.log] MSG_IDNOTFND, could not replace message text for 'MSG_NOTHERE': no such message
+FATAL - [alpha.example] MSG_WRITERR, error writing to test1: 42
+ERROR - [alpha.example] MSG_RDLOCMES, replacement read local message file, parameter is 'dummy/file'
+WARN - [alpha.dlm] MSG_READERR, replacement read error, parameters: 'a.txt' and 'dummy reason'
 .
-./logger_support_test -s warn $localmes | cut -d' ' -f3- | diff $tempfile -
+./logger_support_test -s warn $localmes | diff $tempfile -
 passfail $?
 
 rm -f $localmes