Merge branch 'master' into remove_log_tests

pmem · Jun 28, 2023 · af002a6 · af002a6
2 parents 6ada149 + 10c4d73
commit af002a6
Show file tree

Hide file tree

Showing 93 changed files with 48 additions and 3,344 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,8 +2,11 @@
 
  This release:
  - removes libpmempool tests that use log/blk/btt pool types
+ - removes pmempool tests that use log/blk/btt pool types
  - removes other misc tests using pmempool with log/blk/btt pool types
- - removes libpmemlog tests and examples
+ - removes btt specific test and related btt tests tools
+ - removes btt support from pmemspoil
+ - removes libpmemlog tests and examples
  - ...
 
 Wed May 31 2023 Oksana Sałyk <oksana.salyk@intel.com>

diff --git a/src/test/Makefile b/src/test/Makefile
@@ -118,7 +118,6 @@ OBJ_TESTS = \
 
 OTHER_TESTS = \
  arch_flags\
- bttdevice\
  checksum\
  compat_incompat_features\
  ctl_prefault\
@@ -239,10 +238,8 @@ LIBPMEMPOOL_DEPS = \
 LIBPMEMPOOL_TESTS = \
  libpmempool_include\
  libpmempool_backup\
- libpmempool_bttdev\
  libpmempool_check_version\
  libpmempool_feature\
- libpmempool_map_flog\
  libpmempool_rm
 
 LIBPMEMPOOL_MOD_DEPS = \

diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc
@@ -650,13 +650,6 @@ ifeq ($(USE_PMEMSPOIL), y)
 all: $(TOOLS)/pmemspoil/pmemspoil
 endif
 
-$(TOOLS)/bttcreate/bttcreate:
- $(MAKE) -C $(TOOLS)/bttcreate all
-
-ifeq ($(USE_BTTCREATE), y)
-all: $(TOOLS)/bttcreate/bttcreate
-endif
-
 $(TOOLS)/pmemwrite/pmemwrite:
  $(MAKE) -C $(TOOLS)/pmemwrite all
 

diff --git a/src/test/bttdevice/Makefile b/src/test/bttdevice/Makefile
diff --git a/src/test/bttdevice/README b/src/test/bttdevice/README
diff --git a/src/test/bttdevice/TEST0 b/src/test/bttdevice/TEST0
diff --git a/src/test/bttdevice/TEST1 b/src/test/bttdevice/TEST1
diff --git a/src/test/bttdevice/out0.log.match b/src/test/bttdevice/out0.log.match
diff --git a/src/test/bttdevice/out1.log.match b/src/test/bttdevice/out1.log.match
diff --git a/src/test/libpmempool_api/Makefile b/src/test/libpmempool_api/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2023, Intel Corporation
 
 #
 # src/test/libpmempool_api/Makefile -- build libpmempool_api unittest
@@ -11,6 +11,5 @@ OBJS = libpmempool_test.o
 LIBPMEMPOOL=y
 USE_PMEMSPOIL=y
 USE_PMEMWRITE=y
-USE_BTTCREATE=y
 
 include ../Makefile.inc
diff --git a/src/test/libpmempool_api/Makefile.inc b/src/test/libpmempool_api/Makefile.inc
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2023, Intel Corporation
 
 #
 # src/test/libpmempool_api/Makefile.inc -- build libpmempool_* unittest
@@ -11,6 +11,5 @@
 all: ../libpmempool_api/libpmempool_test
 
 USE_PMEMSPOIL=y
-USE_BTTCREATE=y
 
 include ../Makefile.inc
diff --git a/src/test/libpmempool_api/libpmempool_test.c b/src/test/libpmempool_api/libpmempool_test.c
@@ -118,8 +118,6 @@ main(int argc, char *argv[])
  args.pool_type = PMEMPOOL_POOL_TYPE_LOG;
  } else if (strcmp(optarg, "obj") == 0) {
  args.pool_type = PMEMPOOL_POOL_TYPE_OBJ;
- } else if (strcmp(optarg, "btt") == 0) {
- args.pool_type = PMEMPOOL_POOL_TYPE_BTT;
  } else {
  args.pool_type =
  (uint32_t)strtoul(optarg, NULL, 0);

diff --git a/src/test/libpmempool_bttdev/Makefile b/src/test/libpmempool_bttdev/Makefile
diff --git a/src/test/libpmempool_bttdev/README b/src/test/libpmempool_bttdev/README
diff --git a/src/test/libpmempool_bttdev/TEST0 b/src/test/libpmempool_bttdev/TEST0
diff --git a/src/test/libpmempool_bttdev/TEST1 b/src/test/libpmempool_bttdev/TEST1
diff --git a/src/test/libpmempool_bttdev/TEST10 b/src/test/libpmempool_bttdev/TEST10