Skip to content

Commit

Permalink
Merge pull request #6118 from grom72/obsolete-no-use-log-pmemobj
Browse files Browse the repository at this point in the history
common: remove obsolete code
  • Loading branch information
grom72 authored Oct 2, 2024
2 parents 42950e2 + 412625c commit c347862
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
7 changes: 0 additions & 7 deletions src/test/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,13 @@ endif

ifeq ($(LIBPMEMOBJ), y)
LIBPMEM=y
USE_LOG_PMEMOBJ=y
DYNAMIC_LIBS += -lpmemobj
STATIC_DEBUG_LIBS += $(LIBS_DIR)/debug/libpmemobj.a
STATIC_NONDEBUG_LIBS += $(LIBS_DIR)/nondebug/libpmemobj.a
endif

ifeq ($(LIBPMEMOBJ), internal-debug)
LIBPMEM=y
USE_LOG_PMEMOBJ=y
LIBPMEMCOMMON=internal-debug
OBJS += $(TOP)/src/debug/libpmemobj/alloc_class.o\
$(TOP)/src/debug/libpmemobj/bucket.o\
Expand Down Expand Up @@ -84,7 +82,6 @@ endif

ifeq ($(LIBPMEMOBJ), internal-nondebug)
LIBPMEM=y
USE_LOG_PMEMOBJ=y
LIBPMEMCOMMON=internal-nondebug
OBJS += $(TOP)/src/nondebug/libpmemobj/alloc_class.o\
$(TOP)/src/nondebug/libpmemobj/bucket.o\
Expand Down Expand Up @@ -456,10 +453,6 @@ CFLAGS += -DFAULT_INJECTION=1
CXXFLAGS += -DFAULT_INJECTION=1
endif

ifeq ($(USE_LOG_PMEMOBJ),y)
CFLAGS += -DUSE_LOG_PMEMOBJ
endif

# LIBPMEMCORE == '' means the binary is built without directly linking with
# core units which are required whenever test makes use of core utils.
ifeq ($(LIBPMEMCORE),)
Expand Down
4 changes: 0 additions & 4 deletions src/test/unittest/unittest.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ extern "C" {
#include "log_internal.h"
#include "core_assert.h"

#ifdef USE_LOG_PMEMOBJ
#include "libpmemobj/log.h"
#endif

int ut_get_uuid_str(char *);
#define UT_MAX_ERR_MSG 128
#define UT_POOL_HDR_UUID_STR_LEN 37 /* uuid string length */
Expand Down

0 comments on commit c347862

Please sign in to comment.