Merge pull request #5750 from janekmi/remove_deprecated_pmempool_test…

…s_other test: remove deprecated tests other than (lib)pmempool_*
pmem · Jun 28, 2023 · d42a50d · d42a50d
2 parents e2d0619 + d8a9318
commit d42a50d
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 169 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@
 
 	This release:
 	- removes libpmempool tests that use log/blk/btt pool types
+	- removes other misc tests using pmempool with log/blk/btt pool types
 	- ...
 
 Wed May 31 2023 Oksana Sałyk <oksana.salyk@intel.com>

diff --git a/src/test/ctl_cow/TEST1 b/src/test/ctl_cow/TEST1
diff --git a/src/test/ctl_cow/TEST2 b/src/test/ctl_cow/TEST2
diff --git a/src/test/ctl_prefault/TEST1 b/src/test/ctl_prefault/TEST1
diff --git a/src/test/ctl_prefault/TEST2 b/src/test/ctl_prefault/TEST2
diff --git a/src/test/magic/TEST0 b/src/test/magic/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014-2019, Intel Corporation
+# Copyright 2014-2023, Intel Corporation
 #
 #
 # magic/TEST0 -- test for magic file script
@@ -25,14 +25,6 @@ LOG=out${UNITTEST_NUM}.log
 MAGIC=../../../utils/pmdk.magic
 rm -f $LOG && touch $LOG
 
-rm -f $POOL
-expect_normal_exit $PMEMPOOL create blk 512 $POOL
-expect_normal_exit file -m $MAGIC $POOL >> $LOG
-
-rm -f $POOL
-expect_normal_exit $PMEMPOOL create log $POOL
-expect_normal_exit file -m $MAGIC $POOL >> $LOG
-
 rm -f $POOL
 expect_normal_exit $PMEMPOOL create obj $POOL
 expect_normal_exit file -m $MAGIC $POOL >> $LOG

diff --git a/src/test/magic/out0.log.match b/src/test/magic/out0.log.match
@@ -1,5 +1,3 @@
-$(*): Persistent Memory Pool file, type: BLK, version 0x1
-$(*): Persistent Memory Pool file, type: LOG, version 0x1
 $(*): Persistent Memory Pool file, type: OBJ, version 0x6
 $(*): Persistent Memory Poolset file
 $(*): Persistent Memory Poolset file with replica