Merge "Unify logger and pipe tests a bit" into tizen

diff --git a/configs/dlog-logger.conf.test b/configs/dlog-logger.conf.test
index 99e03fb..eceef37 100644 (file)
--- a/configs/dlog-logger.conf.test
+++ b/configs/dlog-logger.conf.test
@@ -17,11 +17,11 @@ limiter|*|*=allow
 kmsg=:
 syslog=:
 
-kmsg_write_sock=/run/dlog/kmsg.wr
-syslog_write_sock=/run/dlog/syslog.wr
+kmsg_write_sock=/var/lib/dlog-tests/kmsg.wr
+syslog_write_sock=/var/lib/dlog-tests/syslog.wr
 
-kmsg_ctl_sock=/run/dlog/kmsg.ctl
-syslog_ctl_sock=/run/dlog/syslog.ctl
+kmsg_ctl_sock=/var/lib/dlog-tests/kmsg.ctl
+syslog_ctl_sock=/var/lib/dlog-tests/syslog.ctl
 
 kmsg_write_sock_rights=0222
 syslog_write_sock_rights=0222
@@ -33,10 +33,7 @@ kmsg_size=1048576
 syslog_size=1048576
 
 util_sorting_time_window=1000
-
-dlog_logger_conf_system=dlogutil -b system -r 2048 -n 1 -f /var/log/dlog/system -v threadtime *:I
-dlog_logger_conf_main=dlogutil -b main -r 1024 -n 1 -f /var/log/dlog/main -v threadtime *:W
-dlog_logger_conf_radio=dlogutil -b radio -r 256 -n 1 -f /var/log/dlog/radio -v threadtime
-dlog_logger_conf_kmsg=dlogutil -b kmsg -r 1024 -n 1 -f /var/log/dlog/kernel -v kerneltime
 util_sorting_buffer_size=8192
 dynamic_config_path=/tmp/dlog-filters/
+
+dlog_logger_conf_test=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test -v threadtime *:I

diff --git a/configs/dlog-pipe.conf.test b/configs/dlog-pipe.conf.test
index 06e1568..daff84e 100644 (file)
--- a/configs/dlog-pipe.conf.test
+++ b/configs/dlog-pipe.conf.test
@@ -84,7 +84,7 @@ radio_size=1048576
 kmsg_size=1048576
 syslog_size=1048576
 
-dlog_logger_conf_main=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/main -v threadtime *:I
+dlog_logger_conf_test=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test -v threadtime *:I
 
 util_sorting_time_window=5000
 util_sorting_buffer_size=32000

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index 9da1a17..7a66586 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -162,11 +162,9 @@ RUNTIME_FILTERS_DIR="/tmp/dlog-filters/"
 mkdir -p "$RUNTIME_FILTERS_DIR"
 
 # Start the daemon
-if [ "$type" = "pipe" ]; then
-       dlog_logger &
-       LOGGER=$!
-       sleep 1
-fi
+dlog_logger -t 0 &
+LOGGER=$!
+sleep 1
 
 if [ "$TEST_DYNAMIC_FILTERS" = "true" ]; then
        dlogctl -c
@@ -819,20 +817,14 @@ if [ "$TEST_DYNAMIC_FILTERS" = "true" ]; then
                LOG_DETAILS="testing if PID limiting works (14/14)"
                [ "$(dlogutil --pid $DLOGSEND_PID -d | grep -c  blocked)" -eq 3 ] && ok || fail
 
-               # TODO: HACK ALERT!
-               # The following QoS tests make perfect sense for the pipe backend, since we kill the already
-               # existing dlog_logger and then start the new one, configured with QoS. However, on the logger
-               # backend this is impossible, as dlog_test uses the global service started by systemd then.
-               # This means that we have to just launch the second instance and hope nothing breaks.
-               # This can be improved by not using the global service in the logger backend, and by having it
-               # completely disabled in the config file -- this way, the tests would be completely uniform.
                PREQOS_CONFIG_PATH=$DLOG_CONFIG_PATH
                DLOG_CONFIG_PATH="@datadir@/dlog-$type.conf.qos"
-               if [ "$type" = "pipe" ]; then
-                       kill $LOGGER > /dev/null
-                       sleep 1
+               kill $LOGGER > /dev/null
+               sleep 1
+               if [ "$type" = "logger" ]; then
+                       dlogutil -cb main
                fi
-               dlog_logger &
+               dlog_logger -t 0 &
                LOGGER=$!
                sleep 1
 
@@ -844,7 +836,7 @@ if [ "$TEST_DYNAMIC_FILTERS" = "true" ]; then
                if [ "$type" = "logger" ]; then
                        dlogutil -cb main
                fi
-               dlog_logger &
+               dlog_logger -t 0 &
                LOGGER=$!
                sleep 1
 
@@ -856,7 +848,7 @@ if [ "$TEST_DYNAMIC_FILTERS" = "true" ]; then
                if [ "$type" = "logger" ]; then
                        dlogutil -cb main
                fi
-               dlog_logger &
+               dlog_logger -t 0 &
                LOGGER=$!
                sleep 1
 
@@ -872,13 +864,9 @@ if [ "$TEST_DYNAMIC_FILTERS" = "true" ]; then
                DLOG_CONFIG_PATH=$PREQOS_CONFIG_PATH
                kill $LOGGER > /dev/null
                sleep 1
-               if [ "$type" = "pipe" ]; then
-                       dlog_logger -b 99 -t 0 &
-                       LOGGER=$!
-                       sleep 1
-               else
-                       LOGGER=-1
-               fi
+               dlog_logger -t 0 &
+               LOGGER=$!
+               sleep 1
        fi
 fi
 
@@ -930,22 +918,27 @@ LOG_DETAILS="testing if libdlogutil clears the buffer correctly"
 test_libdlogutil clear $LIBDLOGUTIL_CORRECT_PID $type && ok || fail
 
 if [ "$quick" -ne 1 ]; then
-       if [ "$type" = "pipe" ]; then
-               dlogsend -b main -t DLOG_LOGGER_TEST0 -c 100 "hi"
-               sleep 1
-               LOG_DETAILS="testing if logger daemon persistent logging works"
-               [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/main)" -eq 100 ] && ok || fail
+       kill $LOGGER > /dev/null
+       sleep 1
+       rm "$TESTDIR"/test*
+       dlog_logger -t 0 &
+       LOGGER=$!
+       sleep 1
 
-               dlogsend -b main -t DLOG_LOGGER_TEST1 -c 500000 "hi"
-               sleep 1
-               RESULT=$(du -c "$TESTDIR"/main* | 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
-               LOG_DETAILS="testing if logger daemon log rotating works (2/2)"
-               [ "$RESULT" -lt 6144 ] && ok || fail # Max 6 MB
+       dlogsend -b main -t DLOG_LOGGER_TEST0 -c 100 "hi"
+       sleep 1
+       LOG_DETAILS="testing if logger daemon persistent logging works"
+       [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test)" -eq 100 ] && ok || fail
 
-               dlogutil -cb main
-       fi
+       dlogsend -b main -t DLOG_LOGGER_TEST1 -c 500000 "hi"
+       sleep 1
+       RESULT=$(du -c "$TESTDIR"/test* | 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
+       LOG_DETAILS="testing if logger daemon log rotating works (2/2)"
+       [ "$RESULT" -lt 6144 ] && ok || fail # Max 6 MB
+
+       dlogutil -cb main
 
        LOG_DETAILS="testing if the library works with multithreaded app"
        dlogutil -f $TESTDIR/dlog_mt_test &