summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDemo <rger@debian5-demo.demo.example.net>2009-03-31 22:10:37 +0200
committerDemo <rger@debian5-demo.demo.example.net>2009-03-31 22:10:37 +0200
commite3f21521cd6ae237fd9b362281fe188380210fb5 (patch)
treef1a497b19ff3be69538cce910519df53df3fcf90 /tests
parentd27edc7587dba7b850759d151d90cdad1cb34a35 (diff)
downloadrsyslog-e3f21521cd6ae237fd9b362281fe188380210fb5.tar.gz
rsyslog-e3f21521cd6ae237fd9b362281fe188380210fb5.tar.xz
rsyslog-e3f21521cd6ae237fd9b362281fe188380210fb5.zip
fixed some problems with "make check"
interestingly, they manifested on Debian, only, but potentially existed on other platforms, too.
Diffstat (limited to 'tests')
-rw-r--r--tests/DevNull.cfgtest1
-rw-r--r--tests/NoExistFile.cfgtest1
-rwxr-xr-xtests/cfg.sh4
3 files changed, 2 insertions, 4 deletions
diff --git a/tests/DevNull.cfgtest b/tests/DevNull.cfgtest
index d30d936b..7822b6df 100644
--- a/tests/DevNull.cfgtest
+++ b/tests/DevNull.cfgtest
@@ -1,3 +1,2 @@
rsyslogd: CONFIG ERROR: there are no active actions configured. Inputs will run, but no output whatsoever is created. [try http://www.rsyslog.com/e/2103 ]
rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/NoExistFile.cfgtest b/tests/NoExistFile.cfgtest
index 4cbcc029..88d3123f 100644
--- a/tests/NoExistFile.cfgtest
+++ b/tests/NoExistFile.cfgtest
@@ -1,3 +1,2 @@
rsyslogd: CONFIG ERROR: could not interpret master config file '/This/does/not/exist'. [try http://www.rsyslog.com/e/2013 ]
rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/cfg.sh b/tests/cfg.sh
index 8acbf342..cb838354 100755
--- a/tests/cfg.sh
+++ b/tests/cfg.sh
@@ -36,7 +36,7 @@ echo "local directory"
#
# check empty config file
#
-../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail |head -2 > tmp
cmp tmp $srcdir/DevNull.cfgtest
if [ ! $? -eq 0 ]; then
echo "DevNull.cfgtest failed"
@@ -51,7 +51,7 @@ fi;
#
# check missing config file
#
-../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail |head -2 > tmp
cmp tmp $srcdir/NoExistFile.cfgtest
if [ ! $? -eq 0 ]; then
echo "NoExistFile.cfgtest failed"