tests: enable daemon tests for zero-copy

Change-Id: I13168087ef460e74c203ab0f0311b91f6f2421f3

diff --git a/configs/dlog-zero-copy.conf.test b/configs/dlog-zero-copy.conf.test
index ebdc4f4..3d32b59 100644 (file)
--- a/configs/dlog-zero-copy.conf.test
+++ b/configs/dlog-zero-copy.conf.test
@@ -16,3 +16,6 @@ kmsg_conn_sock_group=log
 kmsg_ctl_sock_group=log
 kmsg_size=1048576
 
+dlog_logger_conf_test0=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test0 -v threadtime *:I
+dlog_logger_conf_test1=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test1 -v threadtime
+dlog_logger_conf_test2=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test2 -v threadtime *:E

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index bb4b3f0..bd6b3df 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -1107,13 +1107,13 @@ dlog_test_stdout_redirect $type
 DLOG_CONFIG_PATH=$DLOG_PREV_PATH
 
 if [ "$quick" -ne 1 ]; then
-       if [ "$type" != "zero-copy" ]; then # Backend autodection and logger daemon stuff don't really work on zero-copy
+       if [ "$type" != "zero-copy" ]; then # zero-copy is never autodetected
                kill $LOGGER > /dev/null
                sleep 1
 
                dlog_test_backend_autodetection $type
-               dlog_test_logger_buffering_logging $type
        fi
+       dlog_test_logger_buffering_logging $type
 
        dlog_logger -t 0 &
        LOGGER=$!

diff --git a/tests/dlog_test_logger_buffering_logging.in b/tests/dlog_test_logger_buffering_logging.in
index 56b8cc2..e552198 100644 (file)
--- a/tests/dlog_test_logger_buffering_logging.in
+++ b/tests/dlog_test_logger_buffering_logging.in
@@ -4,22 +4,17 @@ source dlog_test_header
 
 trap cleanup 0
 
-if [ "$1" = "zero-copy" ]; then
-       echo "zero-copy not supported for this test"
-       exit 1
-fi
-
 export DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.test"
 TESTDIR=/var/lib/dlog-tests
 
 rm "$TESTDIR"/test*
 
-dlog_logger -t 0 &
+dlog_logger -t 0 -b 0 &
 LOGGER=$!
 sleep 1
 
 dlogsend -b main -t DLOG_LOGGER_TEST0 -c 100 "hi"
-sleep 1
+sleep 2
 LOG_DETAILS="testing if logger daemon persistent logging works (1/3)"
 [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
 LOG_DETAILS="testing if logger daemon persistent logging works (2/3)"
@@ -28,7 +23,7 @@ LOG_DETAILS="testing if logger daemon persistent logging works (3/3)"
 [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test2)" -eq 0 ] && ok || fail
 
 dlogsend -b main -t DLOG_LOGGER_TEST1 -c 500000 "hi"
-sleep 1
+sleep 4
 RESULT=$(du -c "$TESTDIR"/test0* | tail -n 1 | cut -f 1)
 LOG_DETAILS="testing if logger daemon log rotating works (1/2)"
 [ "$RESULT" -gt 4096 ] && ok || fail # Min 4 MB
@@ -39,6 +34,12 @@ dlogutil -cb main
 kill $LOGGER > /dev/null
 sleep 1
 rm "$TESTDIR"/test0*
+
+if [ "$1" = "zero-copy" ]; then
+       echo "zero-copy not supported for buffering tests"
+       exit 0
+fi
+
 dlog_logger -t 5 -b 100000 &
 LOGGER=$!
 sleep 1