Extend the persistent logging tests a bit

Change-Id: Ia55d584b87a0a670a854c72f3c0ab8d51af49590

diff --git a/configs/dlog-logger.conf.test b/configs/dlog-logger.conf.test
index a540062..022b375 100644 (file)
--- a/configs/dlog-logger.conf.test
+++ b/configs/dlog-logger.conf.test
@@ -36,4 +36,6 @@ util_sorting_time_window=1000
 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
+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/configs/dlog-pipe.conf.test b/configs/dlog-pipe.conf.test
index 6db8423..e0e669a 100644 (file)
--- a/configs/dlog-pipe.conf.test
+++ b/configs/dlog-pipe.conf.test
@@ -84,7 +84,9 @@ radio_size=1048576
 kmsg_size=1048576
 syslog_size=1048576
 
-dlog_logger_conf_test=dlogutil -b main -r 512 -n 10 -f /var/lib/dlog-tests/test -v threadtime *:I
+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
 
 util_sorting_time_window=5000
 util_sorting_buffer_size=32000

diff --git a/tests/dlog_test.in b/tests/dlog_test.in
index 15ea1ba..064a21b 100644 (file)
--- a/tests/dlog_test.in
+++ b/tests/dlog_test.in
@@ -1066,12 +1066,16 @@ if [ "$quick" -ne 1 ]; 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"/test)" -eq 100 ] && ok || fail
+       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)"
+       [ "$(grep -c DLOG_LOGGER_TEST0 "$TESTDIR"/test1)" -eq 100 ] && ok || fail
+       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
-       RESULT=$(du -c "$TESTDIR"/test* | tail -n 1 | cut -f 1)
+       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
        LOG_DETAILS="testing if logger daemon log rotating works (2/2)"
@@ -1080,7 +1084,7 @@ if [ "$quick" -ne 1 ]; then
        dlogutil -cb main
        kill $LOGGER > /dev/null
        sleep 1
-       rm "$TESTDIR"/test*
+       rm "$TESTDIR"/test0*
        dlog_logger -t 5 -b 100000 &
        LOGGER=$!
        sleep 1
@@ -1088,16 +1092,16 @@ if [ "$quick" -ne 1 ]; then
        dlogsend -b main -t DLOG_LOGGER_TEST2 -c 100 "hi"
        sleep 1
        LOG_DETAILS="testing if logger daemon buffering works (1/5)"
-       [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test)" -eq 0 ] && ok || fail
+       [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test0)" -eq 0 ] && ok || fail
 
        sleep 6
        LOG_DETAILS="testing if logger daemon buffering works (2/5)"
-       [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test)" -eq 100 ] && ok || fail
+       [ "$(grep -c DLOG_LOGGER_TEST2 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
 
        dlogsend -b main -t DLOG_LOGGER_TEST3 -c 100 "hi"
        sleep 1
        LOG_DETAILS="testing if logger daemon buffering works (3/5)"
-       [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test)" -eq 0 ] && ok || fail
+       [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test0)" -eq 0 ] && ok || fail
 
        dlogutil -cb main
        kill $LOGGER > /dev/null
@@ -1106,12 +1110,12 @@ if [ "$quick" -ne 1 ]; then
        LOGGER=$!
        sleep 1
        LOG_DETAILS="testing if logger daemon buffering works (4/5)"
-       [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test)" -eq 100 ] && ok || fail
+       [ "$(grep -c DLOG_LOGGER_TEST3 "$TESTDIR"/test0)" -eq 100 ] && ok || fail
 
        dlogsend -b main -t DLOG_LOGGER_TEST4 -c 100 "hi"
        sleep 1
        LOG_DETAILS="testing if logger daemon buffering works (5/5)"
-       [ "$(grep -c DLOG_LOGGER_TEST4 "$TESTDIR"/test)" -gt 90 ] && ok || fail
+       [ "$(grep -c DLOG_LOGGER_TEST4 "$TESTDIR"/test0)" -gt 90 ] && ok || fail
 
        dlogutil -cb main
        kill $LOGGER > /dev/null