Browse Source

[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.
Stephen Morris 14 years ago
parent
commit
c926e1e8bf
1 changed files with 21 additions and 21 deletions
  1. 21 21
      src/lib/log/tests/run_time_init_test.sh.in

+ 21 - 21
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