Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

common: remove obsolete code #6118

Merged
merged 1 commit into from
Oct 2, 2024
Merged

common: remove obsolete code #6118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/test/Makefile.inc
View file
Open in desktop
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
View file
Open in desktop
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
Loading