From 0c70b548e8b154d761b0858b85ebecf2f21bc264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Mon, 14 Jul 2025 21:06:39 +0300 Subject: [PATCH] =?UTF-8?q?mdbx-make:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=86=D0=B5=D0=BB=D0=B8=20`ch?= =?UTF-8?q?eck-posix-locking`=20=D0=B4=D0=BB=D1=8F=20CI-=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=B2=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D0=B0=D0=BD=D1=82=D0=BE=D0=B2=20POSIX-=D0=B1=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BE=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GNUmakefile | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4ce0767e..739fb338 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -299,9 +299,9 @@ lib-shared libmdbx.$(SO_SUFFIX): mdbx-dylib.o $(call select_by,MDBX_BUILD_CXX,md @echo ' LD $@' $(QUIET)$(call select_by,MDBX_BUILD_CXX,$(CXX) $(CXXFLAGS),$(CC) $(CFLAGS)) $^ -pthread -shared $(LDFLAGS) $(call select_by,MDBX_BUILD_CXX,$(LIB_STDCXXFS)) $(LIBS) -o $@ -ninja-assertions: CMAKE_OPT += -DMDBX_FORCE_ASSERTIONS=ON +ninja-assertions: CMAKE_OPT += -DMDBX_FORCE_ASSERTIONS=ON $(MDBX_BUILD_OPTIONS) ninja-assertions: cmake-build -ninja-debug: CMAKE_OPT += -DCMAKE_BUILD_TYPE=Debug +ninja-debug: CMAKE_OPT += -DCMAKE_BUILD_TYPE=Debug $(MDBX_BUILD_OPTIONS) ninja-debug: cmake-build ninja: cmake-build cmake-build: @@ -367,7 +367,7 @@ else .PHONY: build-test build-test-with-valgrind check cross-gcc cross-qemu dist doxygen gcc-analyzer long-test .PHONY: reformat release-assets tags smoke test test-asan smoke-fault test-leak .PHONY: smoke-singleprocess test-singleprocess test-ubsan test-valgrind test-memcheck memcheck smoke-memcheck -.PHONY: smoke-assertion test-assertion long-test-assertion test-ci test-ci-extra +.PHONY: smoke-assertion test-assertion long-test-assertion test-ci test-ci-extra check-posix-locking test-ci-extra: test-ci cross-gcc cross-qemu @@ -435,16 +435,27 @@ MDBX_DIST_DIR = libmdbx-$(MDBX_VERSION_NODOT) MDBX_SMOKE_EXTRA ?= check: DESTDIR = $(shell pwd)/@check-install -check: CMAKE_OPT = -Werror=dev -check: smoke-assertion ninja-assertions dist install test ctest - -smoke-assertion: MDBX_BUILD_OPTIONS:=$(strip $(MDBX_BUILD_OPTIONS) -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0) +check: CMAKE_OPT += -Werror=dev +check: clean | smoke-assertion ninja-assertions dist install test ctest +smoke-assertion: MDBX_BUILD_OPTIONS += -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0 smoke-assertion: smoke -test-assertion: MDBX_BUILD_OPTIONS:=$(strip $(MDBX_BUILD_OPTIONS) -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0) +test-assertion: MDBX_BUILD_OPTIONS += -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0 test-assertion: smoke -long-test-assertion: MDBX_BUILD_OPTIONS:=$(strip $(MDBX_BUILD_OPTIONS) -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0) +long-test-assertion: MDBX_BUILD_OPTIONS += -DMDBX_FORCE_ASSERTIONS=1 -UNDEBUG -DMDBX_DEBUG=0 long-test-assertion: smoke +.PHONY: check-posix-locking-sysv check-posix-locking-1988 check-posix-locking-2001 check-posix-locking-2008 +check-posix-locking-sysv: MDBX_BUILD_OPTIONS += -DMDBX_LOCKING=5 +check-posix-locking-1988: MDBX_BUILD_OPTIONS += -DMDBX_LOCKING=1988 +check-posix-locking-2001: MDBX_BUILD_OPTIONS += -DMDBX_LOCKING=2001 +check-posix-locking-2008: MDBX_BUILD_OPTIONS += -DMDBX_LOCKING=2008 +check-posix-locking-sysv: check +check-posix-locking-1988: check +check-posix-locking-2001: check +check-posix-locking-2008: check +check-posix-locking: + $(QUIET)for LCK in sysv 1988 2001 2008; do $(MAKE) check-posix-locking-$${LCK} || break; done; + smoke: build-test @echo ' SMOKE `mdbx_test basic`...' $(QUIET)rm -f $(TEST_DB) $(TEST_LOG).gz && (set -o pipefail; \