Merge pull request #6044 from pmem/test-no-pmemobj_log_set_function

test: don't configure the log function for PMEMOBJ nor PMEMCORE
pmem · Mar 12, 2024 · d16a3f1 · d16a3f1
2 parents b00e032 + 6f2c54a
commit d16a3f1
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 79 deletions.
diff --git a/src/core/out.h b/src/core/out.h
@@ -68,8 +68,11 @@ void out_init(const char *log_prefix, const char *log_level_var,
 		const char *log_file_var, int major_version,
 		int minor_version);
 void out_fini(void);
+
+#ifdef DEBUG
 void out_log(const char *file, int line, const char *func, int level,
 	const char *fmt, ...) FORMAT_PRINTF(5, 6);
+#endif
 
 #ifdef __cplusplus
 }

diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc
@@ -385,13 +385,11 @@ endif
 
 ifeq ($(LIBPMEMCORE), y)
 LIBPMEM=y
-USE_LOG_PMEMCORE=y
 OBJS += $(LIBS_DIR)/debug/libpmemcore.a
 INCS += -I$(TOP)/src/core
 endif
 
 ifeq ($(LIBPMEMCORE), internal-nondebug)
-USE_LOG_PMEMCORE=y
 OBJS +=\
 	$(TOP)/src/nondebug/core/alloc.o\
 	$(TOP)/src/nondebug/core/fs_posix.o\
@@ -410,7 +408,6 @@ INCS += -I$(TOP)/src/core
 endif
 
 ifeq ($(LIBPMEMCORE), internal-debug)
-USE_LOG_PMEMCORE=y
 OBJS +=\
 	$(TOP)/src/debug/core/alloc.o\
 	$(TOP)/src/debug/core/fs_posix.o\
@@ -531,19 +528,13 @@ CFLAGS += -DFAULT_INJECTION=1
 CXXFLAGS += -DFAULT_INJECTION=1
 endif
 
-ifeq ($(USE_LOG_PMEMCORE),y)
-CFLAGS += -DUSE_LOG_PMEMCORE
-endif
-
 ifeq ($(USE_LOG_PMEMOBJ),y)
 CFLAGS += -DUSE_LOG_PMEMOBJ
 endif
 
-# USE_LOG_PMEMCORE != y means the binary is built without directly linking with
-# core units which are required by libut.a (ut_log.c to be exact).
-# In case the binary is built with directly linking with core units it is
-# assumed the following are among them already.
-ifneq ($(USE_LOG_PMEMCORE),y)
+# LIBPMEMCORE == '' means the binary is built without directly linking with
+# core units which are required whenever test makes use of core utils.
+ifeq ($(LIBPMEMCORE),)
 OBJS += $(TOP)/src/debug/core/out.o
 OBJS += $(TOP)/src/debug/core/last_error_msg.o
 OBJS += $(TOP)/src/debug/core/log.o

diff --git a/src/test/core_log/Makefile.inc b/src/test/core_log/Makefile.inc
@@ -4,8 +4,7 @@
 BUILD_STATIC_DEBUG=n
 BUILD_STATIC_NONDEBUG=n
 
-# 'internal' is required for proper mock integration
-# 'debug' provides 'out_log()' required for 'ut_log_function()'
+# required for proper mock integration
 LIBPMEMCORE=internal-debug
 
 include ../Makefile.inc

diff --git a/src/test/core_log/TESTS.py b/src/test/core_log/TESTS.py
@@ -9,6 +9,7 @@
 
 
 @g.require_granularity(g.ANY)
+@t.require_valgrind_disabled('pmemcheck')
 # The 'nondebug' build is chosen arbitrarily to ensure these tests are run only
 # once. No dynamic libraries are used nor .static_* builds are available.
 @t.require_build('nondebug')

diff --git a/src/test/core_log_default_function/Makefile b/src/test/core_log_default_function/Makefile
@@ -7,9 +7,7 @@ OBJS = core_log_default_function.o
 BUILD_STATIC_DEBUG=n
 BUILD_STATIC_NONDEBUG=n
 
-# 'internal' is required for proper mock integration
-# 'debug' is required for debug version of core/log.o that provides
-# implementation of 'out_log()' that is used by 'ut_log_function()'
+# required for proper mock integration
 LIBPMEMCORE=internal-debug
 
 include ../Makefile.inc

diff --git a/src/test/core_log_default_function/TESTS.py b/src/test/core_log_default_function/TESTS.py
@@ -9,6 +9,7 @@
 
 
 @g.require_granularity(g.ANY)
+@t.require_valgrind_disabled('pmemcheck')
 # The 'debug' build is chosen arbitrarily to ensure these tests are run only
 # once. No dynamic libraries are used nor .static_* builds are available.
 @t.require_build('debug')

diff --git a/src/test/core_log_function_mt/Makefile b/src/test/core_log_function_mt/Makefile
@@ -7,6 +7,6 @@ OBJS = core_log_function_mt.o
 BUILD_STATIC_DEBUG=n
 BUILD_STATIC_NONDEBUG=n
 
-LIBPMEMCORE=nondebug
+LIBPMEMCORE=y
 
 include ../Makefile.inc
diff --git a/src/test/core_log_function_mt/TESTS.py b/src/test/core_log_function_mt/TESTS.py
@@ -9,6 +9,7 @@
 
 
 @g.require_granularity(g.ANY)
+@t.require_valgrind_disabled('pmemcheck', 'memcheck')
 # The 'nondebug' build is chosen arbitrarily to ensure these tests are run only
 # once. No dynamic libraries are used nor .static_* builds are available.
 @t.require_build('nondebug')

diff --git a/src/test/core_log_internal/TESTS.py b/src/test/core_log_internal/TESTS.py
@@ -10,6 +10,7 @@
 
 @g.require_granularity(g.ANY)
 @t.require_build('nondebug')
+@t.require_valgrind_disabled('pmemcheck')
 class CORE_LOG(t.BaseTest):
     test_type = t.Short
 

diff --git a/src/test/core_log_internal/core_log_internal.c b/src/test/core_log_internal/core_log_internal.c
@@ -245,9 +245,6 @@ static struct test_case test_cases[] = {
 #undef abort
 extern void abort(void) __THROW __attribute__((__noreturn__));
 
-#undef LOG_SET_PMEMCORE_FUNC
-#define LOG_SET_PMEMCORE_FUNC
-
 int
 main(int argc, char *argv[])
 {

diff --git a/src/test/core_log_max/TESTS.py b/src/test/core_log_max/TESTS.py
@@ -10,6 +10,7 @@
 
 @g.require_granularity(g.ANY)
 @t.require_build('nondebug')
+@t.require_valgrind_disabled('pmemcheck')
 class CORE_LOG(t.BaseTest):
     test_type = t.Short
 

diff --git a/src/test/core_log_no_func/TESTS.py b/src/test/core_log_no_func/TESTS.py
@@ -9,6 +9,7 @@
 
 
 @g.require_granularity(g.ANY)
+@t.require_valgrind_disabled('pmemcheck')
 # The 'nondebug' build is chosen arbitrarily to ensure these tests are run only
 # once. No dynamic libraries are used nor .static_* builds are available.
 @t.require_build('nondebug')

diff --git a/src/test/core_log_no_func/core_log_no_func.c b/src/test/core_log_no_func/core_log_no_func.c
@@ -55,9 +55,6 @@ static struct test_case test_cases[] = {
 
 #define NTESTS ARRAY_SIZE(test_cases)
 
-#undef LOG_SET_PMEMCORE_FUNC
-#define LOG_SET_PMEMCORE_FUNC
-
 int
 main(int argc, char *argv[])
 {

diff --git a/src/test/core_log_threshold_mt/Makefile b/src/test/core_log_threshold_mt/Makefile
@@ -7,6 +7,6 @@ OBJS = core_log_threshold_mt.o
 BUILD_STATIC_DEBUG=n
 BUILD_STATIC_NONDEBUG=n
 
-LIBPMEMCORE=nondebug
+LIBPMEMCORE=y
 
 include ../Makefile.inc
diff --git a/src/test/core_log_threshold_mt/TESTS.py b/src/test/core_log_threshold_mt/TESTS.py
@@ -10,6 +10,7 @@
 
 @g.require_granularity(g.ANY)
 @t.require_build('nondebug')
+@t.require_valgrind_disabled('pmemcheck', 'memcheck')
 class CORE_LOG_MT(t.BaseTest):
     test_type = t.Short
 

diff --git a/src/test/unittest/Makefile b/src/test/unittest/Makefile
@@ -16,8 +16,7 @@ vpath %.h $(TOP)/src/core
 
 TARGET_UT = libut.a
 OBJS_UT = ut.o ut_alloc.o ut_file.o ut_pthread.o ut_signal.o ut_backtrace.o\
-	os_posix.o os_thread_posix.o util.o alloc.o rand.o ut_fh.o ut_mt.o\
-	ut_log.o
+	os_posix.o os_thread_posix.o util.o alloc.o rand.o ut_fh.o ut_mt.o
 
 CFLAGS = -I$(TOP)/src/include
 CFLAGS += -I$(TOP)/src/common

diff --git a/src/test/unittest/unittest.h b/src/test/unittest/unittest.h
@@ -121,32 +121,9 @@ void ut_err(const char *file, int line, const char *func,
 	const char *fmt, ...)
 	__attribute__((format(printf, 4, 5)));
 
-void
-ut_log_function(enum core_log_level level, const char *file_name,
-	const int line_no, const char *function_name,
-	const char *message);
-
-#ifdef USE_LOG_PMEMCORE
-#define LOG_SET_PMEMCORE_FUNC core_log_set_function(ut_log_function)
-#else
-#define LOG_SET_PMEMCORE_FUNC
-#endif
-
-#ifdef USE_LOG_PMEMOBJ
-#define LOG_SET_PMEMOBJ_FUNC \
-	pmemobj_log_set_function((pmemobj_log_function *)ut_log_function)
-#else
-#define LOG_SET_PMEMOBJ_FUNC
-#endif
-
 /* indicate the start of the test */
 #define START(argc, argv, ...)\
-	do {\
-		ut_start(__FILE__, __LINE__, __func__, argc, argv,\
-			__VA_ARGS__);\
-		LOG_SET_PMEMCORE_FUNC; \
-		LOG_SET_PMEMOBJ_FUNC; \
-	} while (0)
+	ut_start(__FILE__, __LINE__, __func__, argc, argv, __VA_ARGS__)
 
 /* normal exit from test */
 #define DONE(...)\

diff --git a/src/test/unittest/ut_log.c b/src/test/unittest/ut_log.c