tests: verify logger return value

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/logger/errors-id_with_space b/tests/expected/logger/errors-id_with_space
index 081efaccde1ad54d34cb5b8b619f2a078148ed17..79bd05024319959f6000581d38c2e9fd9ae94d7f 100644 (file)
--- a/tests/expected/logger/errors-id_with_space
+++ b/tests/expected/logger/errors-id_with_space
@@ -1,2 +1,4 @@
 test_logger: failed to parse id: 'A B'
+ret: 1
 test_logger: failed to parse id: 'A B'
+ret: 1

diff --git a/tests/expected/logger/errors-invalid_prio b/tests/expected/logger/errors-invalid_prio
index cf79cf388ffdb1823336e5b9280b8399f151b053..7e3aa963336c9f0f096370e5fa09cf8294ba4439 100644 (file)
--- a/tests/expected/logger/errors-invalid_prio
+++ b/tests/expected/logger/errors-invalid_prio
@@ -1 +1,2 @@
 test_logger: unknown priority name: 8
+ret: 1

diff --git a/tests/expected/logger/errors-kern_priority b/tests/expected/logger/errors-kern_priority
index 6656db089a26a4dd9318677077c9b218c19caed8..5b372abca54dfdbe32080a13b07e91ac5b92fd5c 100644 (file)
--- a/tests/expected/logger/errors-kern_priority
+++ b/tests/expected/logger/errors-kern_priority
@@ -1 +1,2 @@
 <8>Feb 13 23:31:30 prio: message
+ret: 0

diff --git a/tests/expected/logger/errors-kern_priority_numeric b/tests/expected/logger/errors-kern_priority_numeric
index 6656db089a26a4dd9318677077c9b218c19caed8..5b372abca54dfdbe32080a13b07e91ac5b92fd5c 100644 (file)
--- a/tests/expected/logger/errors-kern_priority_numeric
+++ b/tests/expected/logger/errors-kern_priority_numeric
@@ -1 +1,2 @@
 <8>Feb 13 23:31:30 prio: message
+ret: 0

diff --git a/tests/expected/logger/errors-rfc5424_exceed_size b/tests/expected/logger/errors-rfc5424_exceed_size
index 91f69b62a8ab5da247462924dee7dd92ca032dc8..be205edd5081c23014647ee2f9df235d34533c7a 100644 (file)
--- a/tests/expected/logger/errors-rfc5424_exceed_size
+++ b/tests/expected/logger/errors-rfc5424_exceed_size
@@ -1 +1,2 @@
 <13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc
+ret: 0

diff --git a/tests/expected/logger/errors-rfc5424_msgid_with_space b/tests/expected/logger/errors-rfc5424_msgid_with_space
index 273bc9b6590c4f6280eb6e7627c5a044a2acf205..ad8bd297e1fa706f801e5ecca99f386e43811b24 100644 (file)
--- a/tests/expected/logger/errors-rfc5424_msgid_with_space
+++ b/tests/expected/logger/errors-rfc5424_msgid_with_space
@@ -1 +1,2 @@
 test_logger: --msgid cannot contain space
+ret: 1

diff --git a/tests/expected/logger/errors-tag_with_space b/tests/expected/logger/errors-tag_with_space
index 9821d82c0d9315f139e50e25d1939284ac0baf5a..712bdccdc81cec72ce62f5436cae8fcd151f86e3 100644 (file)
--- a/tests/expected/logger/errors-tag_with_space
+++ b/tests/expected/logger/errors-tag_with_space
@@ -1,2 +1,4 @@
 <13>Feb 13 23:31:30 A B: tag_with_space
+ret: 0
 <13>1 2009-02-13T23:31:30.123456+00:00 test-hostname A B - - [timeQuality tzKnown="1" isSynced="0"] tag_with_space_rfc5424
+ret: 0

diff --git a/tests/expected/logger/formats-priorities b/tests/expected/logger/formats-priorities
index 32d136f46e9f530331ef9a66043a54093fb0b834..462e90f2299d61b710843a10460f0d3340d27f34 100644 (file)
--- a/tests/expected/logger/formats-priorities
+++ b/tests/expected/logger/formats-priorities
@@ -1,152 +1,304 @@
 <32>Feb 13 23:31:30 prio: auth.emerg
+ret: 0
 <33>Feb 13 23:31:30 prio: auth.alert
+ret: 0
 <34>Feb 13 23:31:30 prio: auth.crit
+ret: 0
 <35>Feb 13 23:31:30 prio: auth.err
+ret: 0
 <36>Feb 13 23:31:30 prio: auth.warning
+ret: 0
 <37>Feb 13 23:31:30 prio: auth.notice
+ret: 0
 <38>Feb 13 23:31:30 prio: auth.info
+ret: 0
 <39>Feb 13 23:31:30 prio: auth.debug
+ret: 0
 <80>Feb 13 23:31:30 prio: authpriv.emerg
+ret: 0
 <81>Feb 13 23:31:30 prio: authpriv.alert
+ret: 0
 <82>Feb 13 23:31:30 prio: authpriv.crit
+ret: 0
 <83>Feb 13 23:31:30 prio: authpriv.err
+ret: 0
 <84>Feb 13 23:31:30 prio: authpriv.warning
+ret: 0
 <85>Feb 13 23:31:30 prio: authpriv.notice
+ret: 0
 <86>Feb 13 23:31:30 prio: authpriv.info
+ret: 0
 <87>Feb 13 23:31:30 prio: authpriv.debug
+ret: 0
 <72>Feb 13 23:31:30 prio: cron.emerg
+ret: 0
 <73>Feb 13 23:31:30 prio: cron.alert
+ret: 0
 <74>Feb 13 23:31:30 prio: cron.crit
+ret: 0
 <75>Feb 13 23:31:30 prio: cron.err
+ret: 0
 <76>Feb 13 23:31:30 prio: cron.warning
+ret: 0
 <77>Feb 13 23:31:30 prio: cron.notice
+ret: 0
 <78>Feb 13 23:31:30 prio: cron.info
+ret: 0
 <79>Feb 13 23:31:30 prio: cron.debug
+ret: 0
 <24>Feb 13 23:31:30 prio: daemon.emerg
+ret: 0
 <25>Feb 13 23:31:30 prio: daemon.alert
+ret: 0
 <26>Feb 13 23:31:30 prio: daemon.crit
+ret: 0
 <27>Feb 13 23:31:30 prio: daemon.err
+ret: 0
 <28>Feb 13 23:31:30 prio: daemon.warning
+ret: 0
 <29>Feb 13 23:31:30 prio: daemon.notice
+ret: 0
 <30>Feb 13 23:31:30 prio: daemon.info
+ret: 0
 <31>Feb 13 23:31:30 prio: daemon.debug
+ret: 0
 <88>Feb 13 23:31:30 prio: ftp.emerg
+ret: 0
 <89>Feb 13 23:31:30 prio: ftp.alert
+ret: 0
 <90>Feb 13 23:31:30 prio: ftp.crit
+ret: 0
 <91>Feb 13 23:31:30 prio: ftp.err
+ret: 0
 <92>Feb 13 23:31:30 prio: ftp.warning
+ret: 0
 <93>Feb 13 23:31:30 prio: ftp.notice
+ret: 0
 <94>Feb 13 23:31:30 prio: ftp.info
+ret: 0
 <95>Feb 13 23:31:30 prio: ftp.debug
+ret: 0
 <48>Feb 13 23:31:30 prio: lpr.emerg
+ret: 0
 <49>Feb 13 23:31:30 prio: lpr.alert
+ret: 0
 <50>Feb 13 23:31:30 prio: lpr.crit
+ret: 0
 <51>Feb 13 23:31:30 prio: lpr.err
+ret: 0
 <52>Feb 13 23:31:30 prio: lpr.warning
+ret: 0
 <53>Feb 13 23:31:30 prio: lpr.notice
+ret: 0
 <54>Feb 13 23:31:30 prio: lpr.info
+ret: 0
 <55>Feb 13 23:31:30 prio: lpr.debug
+ret: 0
 <16>Feb 13 23:31:30 prio: mail.emerg
+ret: 0
 <17>Feb 13 23:31:30 prio: mail.alert
+ret: 0
 <18>Feb 13 23:31:30 prio: mail.crit
+ret: 0
 <19>Feb 13 23:31:30 prio: mail.err
+ret: 0
 <20>Feb 13 23:31:30 prio: mail.warning
+ret: 0
 <21>Feb 13 23:31:30 prio: mail.notice
+ret: 0
 <22>Feb 13 23:31:30 prio: mail.info
+ret: 0
 <23>Feb 13 23:31:30 prio: mail.debug
+ret: 0
 <56>Feb 13 23:31:30 prio: news.emerg
+ret: 0
 <57>Feb 13 23:31:30 prio: news.alert
+ret: 0
 <58>Feb 13 23:31:30 prio: news.crit
+ret: 0
 <59>Feb 13 23:31:30 prio: news.err
+ret: 0
 <60>Feb 13 23:31:30 prio: news.warning
+ret: 0
 <61>Feb 13 23:31:30 prio: news.notice
+ret: 0
 <62>Feb 13 23:31:30 prio: news.info
+ret: 0
 <63>Feb 13 23:31:30 prio: news.debug
+ret: 0
 <40>Feb 13 23:31:30 prio: syslog.emerg
+ret: 0
 <41>Feb 13 23:31:30 prio: syslog.alert
+ret: 0
 <42>Feb 13 23:31:30 prio: syslog.crit
+ret: 0
 <43>Feb 13 23:31:30 prio: syslog.err
+ret: 0
 <44>Feb 13 23:31:30 prio: syslog.warning
+ret: 0
 <45>Feb 13 23:31:30 prio: syslog.notice
+ret: 0
 <46>Feb 13 23:31:30 prio: syslog.info
+ret: 0
 <47>Feb 13 23:31:30 prio: syslog.debug
+ret: 0
 <8>Feb 13 23:31:30 prio: user.emerg
+ret: 0
 <9>Feb 13 23:31:30 prio: user.alert
+ret: 0
 <10>Feb 13 23:31:30 prio: user.crit
+ret: 0
 <11>Feb 13 23:31:30 prio: user.err
+ret: 0
 <12>Feb 13 23:31:30 prio: user.warning
+ret: 0
 <13>Feb 13 23:31:30 prio: user.notice
+ret: 0
 <14>Feb 13 23:31:30 prio: user.info
+ret: 0
 <15>Feb 13 23:31:30 prio: user.debug
+ret: 0
 <64>Feb 13 23:31:30 prio: uucp.emerg
+ret: 0
 <65>Feb 13 23:31:30 prio: uucp.alert
+ret: 0
 <66>Feb 13 23:31:30 prio: uucp.crit
+ret: 0
 <67>Feb 13 23:31:30 prio: uucp.err
+ret: 0
 <68>Feb 13 23:31:30 prio: uucp.warning
+ret: 0
 <69>Feb 13 23:31:30 prio: uucp.notice
+ret: 0
 <70>Feb 13 23:31:30 prio: uucp.info
+ret: 0
 <71>Feb 13 23:31:30 prio: uucp.debug
+ret: 0
 <128>Feb 13 23:31:30 prio: local0.emerg
+ret: 0
 <129>Feb 13 23:31:30 prio: local0.alert
+ret: 0
 <130>Feb 13 23:31:30 prio: local0.crit
+ret: 0
 <131>Feb 13 23:31:30 prio: local0.err
+ret: 0
 <132>Feb 13 23:31:30 prio: local0.warning
+ret: 0
 <133>Feb 13 23:31:30 prio: local0.notice
+ret: 0
 <134>Feb 13 23:31:30 prio: local0.info
+ret: 0
 <135>Feb 13 23:31:30 prio: local0.debug
+ret: 0
 <136>Feb 13 23:31:30 prio: local1.emerg
+ret: 0
 <137>Feb 13 23:31:30 prio: local1.alert
+ret: 0
 <138>Feb 13 23:31:30 prio: local1.crit
+ret: 0
 <139>Feb 13 23:31:30 prio: local1.err
+ret: 0
 <140>Feb 13 23:31:30 prio: local1.warning
+ret: 0
 <141>Feb 13 23:31:30 prio: local1.notice
+ret: 0
 <142>Feb 13 23:31:30 prio: local1.info
+ret: 0
 <143>Feb 13 23:31:30 prio: local1.debug
+ret: 0
 <144>Feb 13 23:31:30 prio: local2.emerg
+ret: 0
 <145>Feb 13 23:31:30 prio: local2.alert
+ret: 0
 <146>Feb 13 23:31:30 prio: local2.crit
+ret: 0
 <147>Feb 13 23:31:30 prio: local2.err
+ret: 0
 <148>Feb 13 23:31:30 prio: local2.warning
+ret: 0
 <149>Feb 13 23:31:30 prio: local2.notice
+ret: 0
 <150>Feb 13 23:31:30 prio: local2.info
+ret: 0
 <151>Feb 13 23:31:30 prio: local2.debug
+ret: 0
 <152>Feb 13 23:31:30 prio: local3.emerg
+ret: 0
 <153>Feb 13 23:31:30 prio: local3.alert
+ret: 0
 <154>Feb 13 23:31:30 prio: local3.crit
+ret: 0
 <155>Feb 13 23:31:30 prio: local3.err
+ret: 0
 <156>Feb 13 23:31:30 prio: local3.warning
+ret: 0
 <157>Feb 13 23:31:30 prio: local3.notice
+ret: 0
 <158>Feb 13 23:31:30 prio: local3.info
+ret: 0
 <159>Feb 13 23:31:30 prio: local3.debug
+ret: 0
 <160>Feb 13 23:31:30 prio: local4.emerg
+ret: 0
 <161>Feb 13 23:31:30 prio: local4.alert
+ret: 0
 <162>Feb 13 23:31:30 prio: local4.crit
+ret: 0
 <163>Feb 13 23:31:30 prio: local4.err
+ret: 0
 <164>Feb 13 23:31:30 prio: local4.warning
+ret: 0
 <165>Feb 13 23:31:30 prio: local4.notice
+ret: 0
 <166>Feb 13 23:31:30 prio: local4.info
+ret: 0
 <167>Feb 13 23:31:30 prio: local4.debug
+ret: 0
 <168>Feb 13 23:31:30 prio: local5.emerg
+ret: 0
 <169>Feb 13 23:31:30 prio: local5.alert
+ret: 0
 <170>Feb 13 23:31:30 prio: local5.crit
+ret: 0
 <171>Feb 13 23:31:30 prio: local5.err
+ret: 0
 <172>Feb 13 23:31:30 prio: local5.warning
+ret: 0
 <173>Feb 13 23:31:30 prio: local5.notice
+ret: 0
 <174>Feb 13 23:31:30 prio: local5.info
+ret: 0
 <175>Feb 13 23:31:30 prio: local5.debug
+ret: 0
 <176>Feb 13 23:31:30 prio: local6.emerg
+ret: 0
 <177>Feb 13 23:31:30 prio: local6.alert
+ret: 0
 <178>Feb 13 23:31:30 prio: local6.crit
+ret: 0
 <179>Feb 13 23:31:30 prio: local6.err
+ret: 0
 <180>Feb 13 23:31:30 prio: local6.warning
+ret: 0
 <181>Feb 13 23:31:30 prio: local6.notice
+ret: 0
 <182>Feb 13 23:31:30 prio: local6.info
+ret: 0
 <183>Feb 13 23:31:30 prio: local6.debug
+ret: 0
 <184>Feb 13 23:31:30 prio: local7.emerg
+ret: 0
 <185>Feb 13 23:31:30 prio: local7.alert
+ret: 0
 <186>Feb 13 23:31:30 prio: local7.crit
+ret: 0
 <187>Feb 13 23:31:30 prio: local7.err
+ret: 0
 <188>Feb 13 23:31:30 prio: local7.warning
+ret: 0
 <189>Feb 13 23:31:30 prio: local7.notice
+ret: 0
 <190>Feb 13 23:31:30 prio: local7.info
+ret: 0
 <191>Feb 13 23:31:30 prio: local7.debug
+ret: 0

diff --git a/tests/expected/logger/formats-rfc3164 b/tests/expected/logger/formats-rfc3164
index 03534609db718cf22a6c68ba2a5dd7b899ec2b07..2ab9fd5b01a662402032021ba484700a8ea6b1eb 100644 (file)
--- a/tests/expected/logger/formats-rfc3164
+++ b/tests/expected/logger/formats-rfc3164
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test-hostname rfc3164: message
+ret: 0

diff --git a/tests/expected/logger/formats-rfc5424_msgid b/tests/expected/logger/formats-rfc5424_msgid
index fee0e430d2b56936e2fdec1d97a4dfdec0529e52..755e97b001087c15c7aab461754e83ad0ff2801d 100644 (file)
--- a/tests/expected/logger/formats-rfc5424_msgid
+++ b/tests/expected/logger/formats-rfc5424_msgid
@@ -1 +1,2 @@
 <13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - MSGID [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0

diff --git a/tests/expected/logger/formats-rfc5424_nohost b/tests/expected/logger/formats-rfc5424_nohost
index 30af1115e72e0f6db714ac25b1c02e8ba096d8d6..30ed025274abbb7d819ad0a92354298b4f74224c 100644 (file)
--- a/tests/expected/logger/formats-rfc5424_nohost
+++ b/tests/expected/logger/formats-rfc5424_nohost
@@ -1 +1,2 @@
 <13>1 2009-02-13T23:31:30.123456+00:00 - rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0

diff --git a/tests/expected/logger/formats-rfc5424_notime b/tests/expected/logger/formats-rfc5424_notime
index 4572dfad46a2576c2d1b834cedf8f658ab317818..d9c96f35fb82d44249216e4fc6e71b6aa0fe4704 100644 (file)
--- a/tests/expected/logger/formats-rfc5424_notime
+++ b/tests/expected/logger/formats-rfc5424_notime
@@ -1 +1,2 @@
 <13>1 - test-hostname rfc5424 - - - message
+ret: 0

diff --git a/tests/expected/logger/formats-rfc5424_simple b/tests/expected/logger/formats-rfc5424_simple
index 8ac4038cf3c078663dad9c91f87ae60760654c25..90e5a34494411c349a46a397265fb67a35339539 100644 (file)
--- a/tests/expected/logger/formats-rfc5424_simple
+++ b/tests/expected/logger/formats-rfc5424_simple
@@ -1 +1,2 @@
 <13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0

diff --git a/tests/expected/logger/journald b/tests/expected/logger/journald
index d4b1549e76fbf7ee10f859dc6163b77d3796a128..75bd0f3e70f0284bdce1b5adc11c34c820f6ab2e 100644 (file)
--- a/tests/expected/logger/journald
+++ b/tests/expected/logger/journald
@@ -1,3 +1,4 @@
 MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a
 MESSAGE=a b c 1 2 3
 
+ret: 0

diff --git a/tests/expected/logger/options-input_file_empty_line b/tests/expected/logger/options-input_file_empty_line
index a10fd1c1bbd2c2e442a2aa4096afd043c066d1fd..d276e3ce15e42bcf7ca79ebae7816ec734c6a704 100644 (file)
--- a/tests/expected/logger/options-input_file_empty_line
+++ b/tests/expected/logger/options-input_file_empty_line
@@ -1,3 +1,4 @@
 <13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5
 <13>Feb 13 23:31:30 test_tag: 
 <13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1}
+ret: 0

diff --git a/tests/expected/logger/options-input_file_prio_prefix b/tests/expected/logger/options-input_file_prio_prefix
index b0f9785120f7589fa1b84ab7526b9c2c6ecf115e..df69bb991cc7cc56a30ca7ca496c9e5f66565830 100644 (file)
--- a/tests/expected/logger/options-input_file_prio_prefix
+++ b/tests/expected/logger/options-input_file_prio_prefix
@@ -1 +1,2 @@
 <66>Feb 13 23:31:30 test_tag:  prio_prefix
+ret: 0

diff --git a/tests/expected/logger/options-input_file_simple b/tests/expected/logger/options-input_file_simple
index e8a2ca86e8b93e1a8eba37a159e63418478efdb6..d855247b2b1b53e58a7d8a61192ee56385b8c697 100644 (file)
--- a/tests/expected/logger/options-input_file_simple
+++ b/tests/expected/logger/options-input_file_simple
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5
+ret: 0

diff --git a/tests/expected/logger/options-input_file_skip_empty b/tests/expected/logger/options-input_file_skip_empty
index cdbe87a2ca08fd100da57da2a3e0e97083f73a0d..277c18688955db1b5d703d034af69425c9da533a 100644 (file)
--- a/tests/expected/logger/options-input_file_skip_empty
+++ b/tests/expected/logger/options-input_file_skip_empty
@@ -1,2 +1,3 @@
 <13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5
 <13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1}
+ret: 0

diff --git a/tests/expected/logger/options-log_pid b/tests/expected/logger/options-log_pid
index d21ecd4fdb4f547821434c2935f3c210dd21d48d..47a0147b2901d938db37f99ae283b72b799d02a4 100644 (file)
--- a/tests/expected/logger/options-log_pid
+++ b/tests/expected/logger/options-log_pid
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0

diff --git a/tests/expected/logger/options-log_pid_define b/tests/expected/logger/options-log_pid_define
index 14024b123440c634be6370acbc7ed59d9ecf51cc..e47b875b680f7b94a175046fd8f95185e5df9e65 100644 (file)
--- a/tests/expected/logger/options-log_pid_define
+++ b/tests/expected/logger/options-log_pid_define
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag[12345]: test
+ret: 0

diff --git a/tests/expected/logger/options-log_pid_long b/tests/expected/logger/options-log_pid_long
index d21ecd4fdb4f547821434c2935f3c210dd21d48d..47a0147b2901d938db37f99ae283b72b799d02a4 100644 (file)
--- a/tests/expected/logger/options-log_pid_long
+++ b/tests/expected/logger/options-log_pid_long
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0

diff --git a/tests/expected/logger/options-log_pid_no_arg b/tests/expected/logger/options-log_pid_no_arg
index d21ecd4fdb4f547821434c2935f3c210dd21d48d..47a0147b2901d938db37f99ae283b72b799d02a4 100644 (file)
--- a/tests/expected/logger/options-log_pid_no_arg
+++ b/tests/expected/logger/options-log_pid_no_arg
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0

diff --git a/tests/expected/logger/options-simple b/tests/expected/logger/options-simple
index 1d0c3a08203fa9cf62169e0e4acab224deae006d..2fa18e01e14a549adb4ad8183fb124fefdd19d17 100644 (file)
--- a/tests/expected/logger/options-simple
+++ b/tests/expected/logger/options-simple
@@ -1 +1,2 @@
 <13>Feb 13 23:31:30 test_tag: test
+ret: 0

diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors
index 369ceb6e2ad451a83c7d2d897c9ef6b1ee68bed5..c50b3e56ae9df27bfba56e12df44aeda04ce7e9f 100755 (executable)
--- a/tests/ts/logger/errors
+++ b/tests/ts/logger/errors
@@ -32,34 +32,43 @@ export LOGGER_TEST_GETPID="98765"
 
 ts_init_subtest "kern_priority"
 $TS_HELPER_LOGGER --no-act -s -t "prio" -p kern.emerg "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "kern_priority_numeric"
 $TS_HELPER_LOGGER --no-act -s -t "prio" -p 0 "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "invalid_prio"
 $TS_HELPER_LOGGER --no-act -s -t "prio" -p 8 "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # should truncate
 ts_init_subtest "rfc5424_exceed_size"
 $TS_HELPER_LOGGER --no-act -s -t "rfc5424_exceed_size" --rfc5424 --size 3 "abcd" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "id_with_space"
 $TS_HELPER_LOGGER --no-act -s -t "id_with_space" --id="A B" "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 $TS_HELPER_LOGGER --no-act -s -t "rfc5424_id_with_space" --rfc5424 --id="A B" "message" >> "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 # should not fail
 ts_init_subtest "tag_with_space"
 $TS_HELPER_LOGGER --no-act -s -t "A B" "tag_with_space" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 $TS_HELPER_LOGGER --no-act -s -t "A B" --rfc5424 "tag_with_space_rfc5424" >> "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "rfc5424_msgid_with_space"
 $TS_HELPER_LOGGER --no-act -s -t "rfc5424_msgid_with_space" --rfc5424 --msgid="A B" "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/logger/formats b/tests/ts/logger/formats
index 4d11c1d9b4c468843b929353ae5e0b128ebe24c0..a647b8159943eb84cf9d8d74ba1d2f579ca84499 100755 (executable)
--- a/tests/ts/logger/formats
+++ b/tests/ts/logger/formats
@@ -32,25 +32,31 @@ export LOGGER_TEST_GETPID="98765"
 
 ts_init_subtest "rfc3164"
 $TS_HELPER_LOGGER -s --no-act -t "rfc3164" --rfc3164 "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "rfc5424_simple"
 $TS_HELPER_LOGGER -s --no-act -t "rfc5424" --rfc5424 "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 ts_init_subtest "rfc5424_notime"
 $TS_HELPER_LOGGER -s --no-act -t "rfc5424" --rfc5424=notime "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 ts_init_subtest "rfc5424_nohost"
 $TS_HELPER_LOGGER -s --no-act -t "rfc5424" --rfc5424=nohost "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 ts_init_subtest "rfc5424_msgid"
 $TS_HELPER_LOGGER -s --no-act -t "rfc5424" --rfc5424 --msgid "MSGID" "message" > "$TS_OUTPUT" 2>&1
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 
 ts_init_subtest "priorities"
 for facility in auth authpriv cron daemon ftp lpr mail news syslog user uucp local{0..7}; do
        for level in emerg alert crit err warning notice info debug; do
                $TS_HELPER_LOGGER -s --no-act -t "prio" -p "$facility.$level" "$facility.$level" >> "$TS_OUTPUT" 2>&1
+               echo "ret: $?" >> "$TS_OUTPUT"
        done
 done
 ts_finalize_subtest

diff --git a/tests/ts/logger/journald b/tests/ts/logger/journald
index 846548aff6f40c39bcdc36ecd99c28e77004e253..81296f78eac009afccecf3c7bb7758611b6b2dfb 100755 (executable)
--- a/tests/ts/logger/journald
+++ b/tests/ts/logger/journald
@@ -31,5 +31,5 @@ fi
 
 printf "%s\n%s\n%s\n" MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a MESSAGE="a b c 1 2 3" |
 $TS_HELPER_LOGGER --no-act --journald --stderr > "$TS_OUTPUT" 2>&1
-
+echo "ret: $?" >> "$TS_OUTPUT"
 ts_finalize

diff --git a/tests/ts/logger/options b/tests/ts/logger/options
index aa212398572f442f3420bb11312c9f4c94a62e98..6bd3236868ab77d29742c596da7506d2f1888351 100755 (executable)
--- a/tests/ts/logger/options
+++ b/tests/ts/logger/options
@@ -56,6 +56,7 @@ for i in "${tests_array[@]}"; do
 
        ts_init_subtest "$name"
        $TS_HELPER_LOGGER --stderr --no-act -t "test_tag" $options > "$TS_OUTPUT" 2>&1
+       echo "ret: $?" >> "$TS_OUTPUT" 
        ts_finalize_subtest
 done