From c3efd63737cfef8c5f40bdd09cacdb9d9e27b17b Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Thu, 31 May 2012 18:21:19 +0200 Subject: Add ylwrap to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 55f069ee..b24a0666 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ missing compile rsyslogd rsyslog.service +ylwrap *.orig rg.conf* *.swp -- cgit From 6861810b736ec0d76358eb5f107ad15e1f5c8273 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Thu, 31 May 2012 18:21:18 +0200 Subject: Don't run valgrind tests if imdiag is not enabled Valgrind tests depend on imdiag as well. --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 50ce2e0b..aff44eef 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,7 +65,6 @@ TESTS += \ failover-no-basic.sh \ rcvr_fail_restore.sh \ linkedlistqueue.sh -endif if HAVE_VALGRIND TESTS += \ @@ -76,7 +75,8 @@ TESTS += \ failover-no-basic-vg.sh \ failover-no-rptd-vg.sh \ tcp-msgreduc-vg.sh -endif +endif # HAVE_VALGRIND +endif # ENABLE_IMDIAG if ENABLE_MYSQL_TESTS -- cgit From 00ce927aa99e40cd8a917963f7c7d7ea6785f118 Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Thu, 31 May 2012 18:21:20 +0200 Subject: Skip tests that require root if euid != 0 This will mark them as SKIPPED instead of FAILED, making it at least in theory possible to get 0 FAILED tests even when running as an unprivileged user. --- tests/imuxsock_ccmiddle_root.sh | 3 +++ tests/imuxsock_logger_root.sh | 3 +++ tests/imuxsock_traillf_root.sh | 3 +++ tests/sndrcv_udp.sh | 3 +++ 4 files changed, 12 insertions(+) diff --git a/tests/imuxsock_ccmiddle_root.sh b/tests/imuxsock_ccmiddle_root.sh index b487611a..7f255bd0 100755 --- a/tests/imuxsock_ccmiddle_root.sh +++ b/tests/imuxsock_ccmiddle_root.sh @@ -2,6 +2,9 @@ # carry out this test echo \[imuxsock_ccmiddle_root.sh\]: test trailing LF handling in imuxsock echo This test must be run as root with no other active syslogd +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/diag.sh init source $srcdir/diag.sh startup imuxsock_ccmiddle_root.conf # send a message with trailing LF diff --git a/tests/imuxsock_logger_root.sh b/tests/imuxsock_logger_root.sh index 377999f7..0902d797 100755 --- a/tests/imuxsock_logger_root.sh +++ b/tests/imuxsock_logger_root.sh @@ -2,6 +2,9 @@ # carry out this test. echo \[imuxsock_logger_root.sh\]: test trailing LF handling in imuxsock echo This test must be run as root with no other active syslogd +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/diag.sh init source $srcdir/diag.sh startup imuxsock_logger_root.conf # send a message with trailing LF diff --git a/tests/imuxsock_traillf_root.sh b/tests/imuxsock_traillf_root.sh index 1b821ee7..0141a626 100755 --- a/tests/imuxsock_traillf_root.sh +++ b/tests/imuxsock_traillf_root.sh @@ -2,6 +2,9 @@ # carry out this test echo \[imuxsock_traillf_root.sh\]: test trailing LF handling in imuxsock echo This test must be run as root with no other active syslogd +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/diag.sh init source $srcdir/diag.sh startup imuxsock_traillf_root.conf # send a message with trailing LF diff --git a/tests/sndrcv_udp.sh b/tests/sndrcv_udp.sh index 274a414a..df37782c 100755 --- a/tests/sndrcv_udp.sh +++ b/tests/sndrcv_udp.sh @@ -7,4 +7,7 @@ # This file is part of the rsyslog project, released under GPLv3 echo =============================================================================== echo \[sndrcv_udp.sh\]: testing sending and receiving via udp +if [ "$EUID" -ne 0 ]; then + exit 77 # Not root, skip this test +fi source $srcdir/sndrcv_drvr.sh sndrcv_udp 50 -- cgit