From d8a93183aa2e010a1db96b08347816ae3b0b4a87 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Mon, 26 Jun 2023 14:30:41 -0400 Subject: [PATCH] test: remove deprecated tests other than (lib)pmempool_* Signed-off-by: Jan Michalski --- ChangeLog | 1 + src/test/ctl_cow/TEST1 | 36 ----------------------------- src/test/ctl_cow/TEST2 | 36 ----------------------------- src/test/ctl_prefault/TEST1 | 43 ----------------------------------- src/test/ctl_prefault/TEST2 | 43 ----------------------------------- src/test/magic/TEST0 | 10 +------- src/test/magic/out0.log.match | 2 -- 7 files changed, 2 insertions(+), 169 deletions(-) delete mode 100755 src/test/ctl_cow/TEST1 delete mode 100755 src/test/ctl_cow/TEST2 delete mode 100755 src/test/ctl_prefault/TEST1 delete mode 100755 src/test/ctl_prefault/TEST2 diff --git a/ChangeLog b/ChangeLog index b1e55370be9..f22193e424e 100644 --- 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 diff --git a/src/test/ctl_cow/TEST1 b/src/test/ctl_cow/TEST1 deleted file mode 100755 index ffd6cbcb14f..00000000000 --- a/src/test/ctl_cow/TEST1 +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019, Intel Corporation - -# -# src/test/ctl_cow/TEST1 -- unit test which checks copy on writ feature -# for log pool -# - -. ../unittest/unittest.sh - -require_test_type medium -require_command md5sum - -setup - -POOL="testfile.log" - -expect_normal_exit $PMEMPOOL$EXESUFFIX create -s 32MB log $DIR/$POOL - -POOL_BEFORE=`md5sum -b $DIR/$POOL` - -PMEMLOG_CONF="${PMEMLOG_CONF}copy_on_write.at_open=1" - -expect_normal_exit ./ctl_cow$EXESUFFIX $DIR/$POOL log - -POOL_AFTER=`md5sum -b $DIR/$POOL` - -if [ "$POOL_BEFORE" != "$POOL_AFTER" ] -then - fatal "$POOL_BEFORE != $POOL_AFTER" -fi - -check - -pass diff --git a/src/test/ctl_cow/TEST2 b/src/test/ctl_cow/TEST2 deleted file mode 100755 index f07fb470906..00000000000 --- a/src/test/ctl_cow/TEST2 +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2019, Intel Corporation - -# -# src/test/ctl_cow/TEST2 -- unit test which checks copy on writ feature -# for blk pool -# - -. ../unittest/unittest.sh - -require_test_type medium -require_command md5sum - -setup - -POOL="testfile.blk" - -expect_normal_exit $PMEMPOOL$EXESUFFIX create -s 32MB blk 512 $DIR/$POOL - -POOL_BEFORE=`md5sum -b $DIR/$POOL` - -PMEMBLK_CONF="${PMEMBLK_CONF}copy_on_write.at_open=1" - -expect_normal_exit ./ctl_cow$EXESUFFIX $DIR/$POOL blk - -POOL_AFTER=`md5sum -b $DIR/$POOL` - -if [ "$POOL_BEFORE" != "$POOL_AFTER" ] -then - fatal "$POOL_BEFORE != $POOL_AFTER" -fi - -check - -pass diff --git a/src/test/ctl_prefault/TEST1 b/src/test/ctl_prefault/TEST1 deleted file mode 100755 index 15e71ac4638..00000000000 --- a/src/test/ctl_prefault/TEST1 +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019, Intel Corporation - -. ../unittest/unittest.sh - -require_test_type short - -setup - -# without fallocate, creating pool causes writes to each block and -# number of page faults is the same no matter if prefaulting is enabled -require_native_fallocate $DIR/testfile1 - -# create, don't prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX blk $DIR/testfile1 0 0 -pagefault_create_baseline=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -# open, don't prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX blk $DIR/testfile1 0 1 -pagefault_open_baseline=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -rm -f $DIR/testfile1 - -# create, prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX blk $DIR/testfile1 2 0 -pagefault_create_prefault=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -# open, prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX blk $DIR/testfile1 1 1 -pagefault_open_prefault=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -rm -f $DIR/testfile1 - -if [ ${pagefault_create_baseline} -ge ${pagefault_create_prefault} ]; then - fatal "create: ${pagefault_create_baseline} >= ${pagefault_create_prefault} " -fi - -if [ ${pagefault_open_baseline} -ge ${pagefault_open_prefault} ]; then - fatal "open: ${pagefault_open_baseline} >= ${pagefault_open_prefault}" -fi - -pass diff --git a/src/test/ctl_prefault/TEST2 b/src/test/ctl_prefault/TEST2 deleted file mode 100755 index 750d46c790b..00000000000 --- a/src/test/ctl_prefault/TEST2 +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2019, Intel Corporation - -. ../unittest/unittest.sh - -require_test_type short - -setup - -# without fallocate, creating pool causes writes to each block and -# number of page faults is the same no matter if prefaulting is enabled -require_native_fallocate $DIR/testfile1 - -# create, don't prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX log $DIR/testfile1 0 0 -pagefault_create_baseline=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -# open, don't prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX log $DIR/testfile1 0 1 -pagefault_open_baseline=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -rm -f $DIR/testfile1 - -# create, prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX log $DIR/testfile1 2 0 -pagefault_create_prefault=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -# open, prefault -expect_normal_exit ./ctl_prefault$EXESUFFIX log $DIR/testfile1 1 1 -pagefault_open_prefault=`cat out$UNITTEST_NUM.log | sed -n '3p'` - -rm -f $DIR/testfile1 - -if [ ${pagefault_create_baseline} -ge ${pagefault_create_prefault} ]; then - fatal "create: ${pagefault_create_baseline} >= ${pagefault_create_prefault} " -fi - -if [ ${pagefault_open_baseline} -ge ${pagefault_open_prefault} ]; then - fatal "open: ${pagefault_open_baseline} >= ${pagefault_open_prefault}" -fi - -pass diff --git a/src/test/magic/TEST0 b/src/test/magic/TEST0 index f52415df3e8..4f26d08c7d7 100755 --- 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 index 3ba52e350b3..4c720ee551a 100644 --- 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