Disallow redirecting to stdout based on config keys

[platform/core/system/dlog.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 656c743..94a02cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -459,6 +459,24 @@ test_libredirect_multi_LDADD = \
 test_libredirect_multi_SOURCES = \
        tests/test_libredirect_multi.c
 
+usrlibexeclibdlog_PROGRAMS += test_config_redirect
+test_config_redirect_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fPIE
+
+test_config_redirect_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -pie
+
+test_config_redirect_DEPENDENCIES = \
+       libdlog_redirect_stdout.la
+
+test_config_redirect_LDADD = \
+       libdlog_redirect_stdout.la
+
+test_config_redirect_SOURCES = \
+       tests/test_config_redirect.c
+
 
 check_PROGRAMS = \
        src/tests/test_ptrs_list_foreach_pos \
@@ -466,6 +484,7 @@ check_PROGRAMS = \
        src/tests/test_fastlz_neg \
        src/tests/fuzz_logprint \
        src/tests/test_libdlog_container_warning \
+       src/tests/test_log_storage_peek \
        src/tests/test_logger_log_storage \
        src/tests/test_logger_compressed_storage \
        src/tests/test_ptrs_list_pos \
@@ -546,6 +565,10 @@ src_tests_test_logger_log_storage_SOURCES = src/tests/test_logger_log_storage.c
 src_tests_test_logger_log_storage_CFLAGS = $(check_CFLAGS)
 src_tests_test_logger_log_storage_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=malloc
 
+src_tests_test_log_storage_peek_SOURCES = src/tests/test_log_storage_peek.c src/logger/log_storage.c src/shared/ptrs_list.c src/shared/queued_entry_timestamp.c
+src_tests_test_log_storage_peek_CFLAGS = $(check_CFLAGS)
+src_tests_test_log_storage_peek_LDFLAGS = $(AM_LDFLAGS)
+
 src_tests_test_logger_compressed_storage_SOURCES = src/tests/test_logger_compressed_storage.c \
        src/logger/compression_fastlz.c \
        src/logger/compression_miniz.c \
@@ -692,7 +715,7 @@ src_tests_logctl_CFLAGS = $(check_CFLAGS)
 src_tests_logctl_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=calloc,--wrap=asprintf,--wrap=open,--wrap=open64,--wrap=fdopen,--wrap=fdopen64,--wrap=mkstemp,--wrap=mkstemp64,--wrap=fchmod,--wrap=rename
 
 src_tests_config_SOURCES = src/tests/config.c src/shared/logconfig.c src/shared/logcommon.c src/shared/parsers.c
-src_tests_config_CFLAGS = $(check_CFLAGS)
+src_tests_config_CFLAGS = $(check_CFLAGS) -D_FILE_OFFSET_BITS=64
 src_tests_config_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=openat64,--wrap=openat,--wrap=scandirat,--wrap=scandirat64,--wrap=fdopen,--wrap=fdopen64,--wrap=open,--wrap=open64,--wrap=calloc
 
 src_tests_logprint_SOURCES = src/tests/logprint.c src/shared/ptrs_list.c src/shared/logconfig.c src/shared/buffer_traits.c src/shared/logprint.c src/shared/logcommon.c src/shared/queued_entry.c src/shared/parsers.c src/shared/translate_syslog.c src/shared/queued_entry_timestamp.c
@@ -706,7 +729,7 @@ src_tests_qos_distributions_LDFLAGS = $(AM_LDFLAGS)
 
 src_tests_logger_SOURCES = src/tests/logger.c $(dlog_logger_SOURCES)
 src_tests_logger_CFLAGS = $(check_CFLAGS) -pthread
-src_tests_logger_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=getgrnam_r,--wrap=getpwnam_r,--wrap=getegid,--wrap=geteuid,--wrap=setgid,--wrap=setuid,--wrap=socket,--wrap=unlink,--wrap=bind,--wrap=close,--wrap=chmod,--wrap=listen,--wrap=sysconf,--wrap=sd_listen_fds,--wrap=sd_is_socket_unix,--wrap=symlink,--wrap=calloc,--wrap=open,--wrap=open64,--wrap=fcntl,--wrap=fcntl64,--wrap=log_storage_reader_get_ready_bytes,--wrap=free,--wrap=log_storage_add_new_entry,--wrap=epoll_ctl,--wrap=log_storage_new_reader
+src_tests_logger_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=getgrnam_r,--wrap=getpwnam_r,--wrap=getegid,--wrap=geteuid,--wrap=setgid,--wrap=setuid,--wrap=socket,--wrap=unlink,--wrap=bind,--wrap=close,--wrap=chmod,--wrap=listen,--wrap=sysconf,--wrap=sd_listen_fds,--wrap=sd_is_socket_unix,--wrap=symlink,--wrap=calloc,--wrap=open,--wrap=open64,--wrap=fcntl,--wrap=fcntl64,--wrap=log_storage_reader_get_ready_bytes,--wrap=free,--wrap=log_storage_add_new_entry,--wrap=epoll_ctl
 
 src_tests_logutil_pos_SOURCES = src/tests/logutil_pos.c \
        src/libdlogutil/sort_vector.c \
@@ -902,7 +925,13 @@ data_DATA = \
        configs/dlog-pipe.conf.plog \
        configs/dlog-logger.conf.plog \
        configs/dlog-pipe.conf.autodetect \
-       configs/dlog-logger.conf.autodetect
+       configs/dlog-logger.conf.autodetect \
+       configs/dlog-logger.conf.stdout_enable.1 \
+       configs/dlog-logger.conf.stdout_enable.2 \
+       configs/dlog-logger.conf.stdout_enable.3 \
+       configs/dlog-pipe.conf.stdout_enable.1 \
+       configs/dlog-pipe.conf.stdout_enable.2 \
+       configs/dlog-pipe.conf.stdout_enable.3
 
 unitdir = $(prefix)/lib/systemd/system
 nodist_unit_DATA = units/dlog_logger.service \