diff --git a/src/test/obj_ndctl_bb/TEST1 b/src/test/obj_ndctl_bb/TEST1 index b01d407469..1b0d519c6d 100755 --- a/src/test/obj_ndctl_bb/TEST1 +++ b/src/test/obj_ndctl_bb/TEST1 @@ -8,12 +8,13 @@ . ../unittest/unittest.sh -require_real_pmem require_ndctl_enable require_test_type short setup +require_sds ./obj_ndctl_bb + TMP=tmp${UNITTEST_NUM}.log rm -f $TMP diff --git a/src/test/obj_ndctl_sds/TEST1 b/src/test/obj_ndctl_sds/TEST1 index 44d9b37ebe..78dd7d132e 100755 --- a/src/test/obj_ndctl_sds/TEST1 +++ b/src/test/obj_ndctl_sds/TEST1 @@ -8,12 +8,13 @@ . ../unittest/unittest.sh -require_real_pmem require_ndctl_enable require_test_type short setup +require_sds ./obj_ndctl_sds + TMP=tmp${UNITTEST_NUM}.log rm -f $TMP diff --git a/src/test/obj_pool/TEST32 b/src/test/obj_pool/TEST32 index 024f22cd10..8616c33e90 100755 --- a/src/test/obj_pool/TEST32 +++ b/src/test/obj_pool/TEST32 @@ -11,12 +11,11 @@ . ../unittest/unittest.sh require_test_type medium -# For non-pmem POOL_FEAT_CHECK_BAD_BLOCKS is turned off via PMEMOBJ_CONF="sds.at_create=0" -require_real_pmem -require_sds ./obj_pool setup +require_sds ./obj_pool + # # TEST32 existing file, file size >= min required size, # layout matches the value from pool header @@ -26,8 +25,6 @@ expect_normal_exit ./obj_pool$EXESUFFIX c $DIR/testfile "test" 20 0640 # create a bad block recovery file create_recovery_file $DIR/testfile_r0_p0_badblocks.txt -turn_on_checking_bad_blocks $DIR/testfile - # pmemobj_open() should fail, because the bad block recovery file exists expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testfile "test" diff --git a/src/test/obj_pool/TEST33 b/src/test/obj_pool/TEST33 index 299291164b..15f3e2a9f8 100755 --- a/src/test/obj_pool/TEST33 +++ b/src/test/obj_pool/TEST33 @@ -11,12 +11,11 @@ . ../unittest/unittest.sh require_test_type medium -# For non-pmem POOL_FEAT_CHECK_BAD_BLOCKS is turned off via PMEMOBJ_CONF="sds.at_create=0" -require_real_pmem -require_sds ./obj_pool setup +require_sds ./obj_pool + POOLSET=$DIR/testset1 create_poolset $POOLSET 10M:$DIR/testfile0:z 10M:$DIR/testfile1:z 10M:$DIR/testfile2:z \ R 30M:$DIR/testfile3:z @@ -33,8 +32,6 @@ create_recovery_file $DIR/testset1_r0_p1_badblocks.txt create_recovery_file $DIR/testset1_r0_p2_badblocks.txt create_recovery_file $DIR/testset1_r1_p0_badblocks.txt -turn_on_checking_bad_blocks $DIR/testset1 - # pmemobj_open() should fail, because the bad block recovery files exist expect_normal_exit ./obj_pool$EXESUFFIX o $DIR/testset1 "test" diff --git a/src/test/pmempool_sync/TEST32 b/src/test/pmempool_sync/TEST32 index 670ed31da6..a6468644a8 100755 --- a/src/test/pmempool_sync/TEST32 +++ b/src/test/pmempool_sync/TEST32 @@ -13,13 +13,14 @@ . ../unittest/unittest.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG diff --git a/src/test/pmempool_sync/TEST33 b/src/test/pmempool_sync/TEST33 index 9a5ca2b9f5..bc3a7c9042 100755 --- a/src/test/pmempool_sync/TEST33 +++ b/src/test/pmempool_sync/TEST33 @@ -13,13 +13,14 @@ . ../unittest/unittest.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG @@ -36,8 +37,6 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX c v &>> $LOG" -turn_on_checking_bad_blocks $POOLSET - # zero blocks: offset: 0 length: 250 zero_blocks $DIR/testfile1 0 250 diff --git a/src/test/pmempool_sync/TEST34 b/src/test/pmempool_sync/TEST34 index 0d0e0ce6c9..4042fbc223 100755 --- a/src/test/pmempool_sync/TEST34 +++ b/src/test/pmempool_sync/TEST34 @@ -15,13 +15,14 @@ . setup.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG @@ -50,8 +51,6 @@ create_recovery_file $DIR/testset1_r0_p1_badblocks.txt create_recovery_file $DIR/testset1_r0_p2_badblocks.txt create_recovery_file $DIR/testset1_r1_p0_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of recovery files expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST35 b/src/test/pmempool_sync/TEST35 index 0554156118..37618a6664 100755 --- a/src/test/pmempool_sync/TEST35 +++ b/src/test/pmempool_sync/TEST35 @@ -15,13 +15,14 @@ . setup.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG @@ -50,8 +51,6 @@ create_recovery_file $DIR/testset1_r0_p1_badblocks.txt 1000 250 create_recovery_file $DIR/testset1_r0_p2_badblocks.txt create_recovery_file $DIR/testset1_r1_p0_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of recovery files expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST36 b/src/test/pmempool_sync/TEST36 index 19739f767d..733be80483 100755 --- a/src/test/pmempool_sync/TEST36 +++ b/src/test/pmempool_sync/TEST36 @@ -16,13 +16,14 @@ . setup.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG @@ -39,8 +40,6 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX c v &>> $LOG" -turn_on_checking_bad_blocks $POOLSET - # zero blocks: offset: 1000 length: 250 zero_blocks $DIR/testfile0 1000 250 diff --git a/src/test/pmempool_sync/TEST37 b/src/test/pmempool_sync/TEST37 index bc9879e5cb..7d3141c832 100755 --- a/src/test/pmempool_sync/TEST37 +++ b/src/test/pmempool_sync/TEST37 @@ -16,13 +16,14 @@ . setup.sh -require_real_pmem require_test_type medium require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG @@ -39,8 +40,6 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj --layout pmempool$SUFFIX $POOL expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX c v &>> $LOG" -turn_on_checking_bad_blocks $POOLSET - # zero blocks: offset: 125 length: 125 zero_blocks $DIR/testfile1 125 125 diff --git a/src/test/pmempool_sync/TEST43 b/src/test/pmempool_sync/TEST43 index 86ab559d0a..2a4475bdea 100755 --- a/src/test/pmempool_sync/TEST43 +++ b/src/test/pmempool_sync/TEST43 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST43 -- test for sync command with badblocks @@ -12,14 +12,14 @@ . ../unittest/unittest.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -57,8 +57,6 @@ create_recovery_file $DIR/testset1_r1_p0_badblocks.txt create_recovery_file $DIR/testset1_r1_p1_badblocks.txt 126 2 create_recovery_file $DIR/testset1_r1_p2_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fixing bad blocks should fail expect_abnormal_exit "$PMEMPOOL$EXESUFFIX sync -v -b $POOLSET &>> $LOG" diff --git a/src/test/pmempool_sync/TEST44 b/src/test/pmempool_sync/TEST44 index 74ce57cafc..aad222e180 100755 --- a/src/test/pmempool_sync/TEST44 +++ b/src/test/pmempool_sync/TEST44 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST44 -- test for sync command with badblocks @@ -17,14 +17,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -72,8 +72,6 @@ create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1000 1 1002 1 create_recovery_file $DIR/testset1_r2_p1_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST45 b/src/test/pmempool_sync/TEST45 index 67b79532a7..9ef481b40b 100755 --- a/src/test/pmempool_sync/TEST45 +++ b/src/test/pmempool_sync/TEST45 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST45 -- test for sync command with badblocks @@ -15,14 +15,14 @@ . ../unittest/unittest.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -70,8 +70,6 @@ create_recovery_file $DIR/testset1_r2_p0_badblocks.txt create_recovery_file $DIR/testset1_r2_p1_badblocks.txt 125 1 127 1 create_recovery_file $DIR/testset1_r2_p2_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST46 b/src/test/pmempool_sync/TEST46 index b78d19b9ef..3e55d47adb 100755 --- a/src/test/pmempool_sync/TEST46 +++ b/src/test/pmempool_sync/TEST46 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST46 -- test for sync command with badblocks @@ -15,14 +15,14 @@ . ../unittest/unittest.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -70,8 +70,6 @@ create_recovery_file $DIR/testset1_r2_p0_badblocks.txt create_recovery_file $DIR/testset1_r2_p1_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt 125 1 127 1 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST47 b/src/test/pmempool_sync/TEST47 index 7beb008952..194262fdf9 100755 --- a/src/test/pmempool_sync/TEST47 +++ b/src/test/pmempool_sync/TEST47 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST47 -- test for sync command with badblocks @@ -16,14 +16,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -73,8 +73,6 @@ create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1000 2 create_recovery_file $DIR/testset1_r2_p1_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt 1000 2 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST48 b/src/test/pmempool_sync/TEST48 index 2015ee7635..bcc046ee0a 100755 --- a/src/test/pmempool_sync/TEST48 +++ b/src/test/pmempool_sync/TEST48 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST48 -- test for sync command with badblocks @@ -19,14 +19,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -76,8 +76,6 @@ create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1001 2 create_recovery_file $DIR/testset1_r2_p1_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt 1000 2 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST49 b/src/test/pmempool_sync/TEST49 index e9279dbca6..d0f94cc382 100755 --- a/src/test/pmempool_sync/TEST49 +++ b/src/test/pmempool_sync/TEST49 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2011-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST49 -- test for sync command with badblocks @@ -20,14 +20,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -75,8 +75,6 @@ create_recovery_file $DIR/testset1_r1_p2_badblocks.txt 1000 3 create_recovery_file $DIR/testset1_r2_p2_badblocks.txt 1000 3 create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1000 3 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST50 b/src/test/pmempool_sync/TEST50 index 0ab62e01c6..dad28761a0 100755 --- a/src/test/pmempool_sync/TEST50 +++ b/src/test/pmempool_sync/TEST50 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST50 -- test for sync command with badblocks @@ -20,14 +20,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -75,8 +75,6 @@ create_recovery_file $DIR/testset1_r1_p2_badblocks.txt 1001 1 create_recovery_file $DIR/testset1_r2_p2_badblocks.txt 1001 1 create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1001 1 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST51 b/src/test/pmempool_sync/TEST51 index e35b1bb1aa..bdec17a134 100755 --- a/src/test/pmempool_sync/TEST51 +++ b/src/test/pmempool_sync/TEST51 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST51 -- test for sync command with badblocks @@ -21,14 +21,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -76,8 +76,6 @@ create_recovery_file $DIR/testset1_r0_p1_badblocks.txt 1000 3 create_recovery_file $DIR/testset1_r1_p2_badblocks.txt 1000 3 create_recovery_file $DIR/testset1_r2_p0_badblocks.txt 1000 3 -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST52 b/src/test/pmempool_sync/TEST52 index ebf20e5560..5ad02a0464 100755 --- a/src/test/pmempool_sync/TEST52 +++ b/src/test/pmempool_sync/TEST52 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST52 -- test for sync command with badblocks @@ -16,14 +16,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -73,8 +73,6 @@ create_recovery_file $DIR/testset1_r0_p2_badblocks.txt create_recovery_file $DIR/testset1_r1_p2_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/pmempool_sync/TEST53 b/src/test/pmempool_sync/TEST53 index 441055510c..701f84f25f 100755 --- a/src/test/pmempool_sync/TEST53 +++ b/src/test/pmempool_sync/TEST53 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause # Copyright 2011-2024, Intel Corporation -# Copyright 2025, Hewlett Packard Enterprise Development LP +# Copyright 2025-2026, Hewlett Packard Enterprise Development LP # # # pmempool_sync/TEST53 -- test for sync command with badblocks @@ -18,14 +18,14 @@ . setup.sh -require_real_pmem require_test_type medium -require_fs_type non-pmem require_build_type debug nondebug require_linked_with_ndctl $PMEMPOOL$EXESUFFIX setup +require_sds $PMEMPOOL$EXESUFFIX + export PMEMPOOL_LOG_LEVEL=10 LOG=out${UNITTEST_NUM}.log @@ -75,8 +75,6 @@ create_recovery_file $DIR/testset1_r0_p2_badblocks.txt create_recovery_file $DIR/testset1_r1_p2_badblocks.txt create_recovery_file $DIR/testset1_r2_p2_badblocks.txt -turn_on_checking_bad_blocks $POOLSET - # fail because of bad blocks expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG" diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh index 0b297d5f69..00ad1ba277 100644 --- a/src/test/unittest/unittest.sh +++ b/src/test/unittest/unittest.sh @@ -2610,25 +2610,3 @@ function set_test_labels() { verbose_msg "$UNITTEST_NAME: SKIP ($TEST/$REAL_FS/$BUILD$MCSTR$PROV$PM) test-labels: $* ($TEST_LABEL required)" exit 0 } - -# -# require_real_pmem -- run tests only on real pmem -# -function require_real_pmem() { - local path="$1" - if [ -z "$path" ]; then - path="$DIR" - fi - if [ "$PMEM_IS_PMEM_FORCE" == "1" ]; then - verbose_msg "$UNITTEST_NAME: SKIP ($TEST/$REAL_FS/$BUILD$MCSTR$PROV$PM) PMEM is forced (PMEM_IS_PMEM_FORCE=$PMEM_IS_PMEM_FORCE), real PMEM required" - exit 0 - fi - case "$REAL_FS" in - pmem) - ;; - *) - verbose_msg "$UNITTEST_NAME: SKIP ($TEST/$REAL_FS/$BUILD$MCSTR$PROV$PM) REAL_FS $REAL_FS (pmem required)" - exit 0 - ;; - esac -} diff --git a/src/test/util_sds_check/TEST0 b/src/test/util_sds_check/TEST0 index 86cbacc329..a5b8561feb 100755 --- a/src/test/util_sds_check/TEST0 +++ b/src/test/util_sds_check/TEST0 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_dirty_clear diff --git a/src/test/util_sds_check/TEST1 b/src/test/util_sds_check/TEST1 index dee5359277..3bdce3b59c 100755 --- a/src/test/util_sds_check/TEST1 +++ b/src/test/util_sds_check/TEST1 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_invalid_checksum diff --git a/src/test/util_sds_check/TEST2 b/src/test/util_sds_check/TEST2 index 0b9dc9ed75..fbb6573673 100755 --- a/src/test/util_sds_check/TEST2 +++ b/src/test/util_sds_check/TEST2 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_dirty_set diff --git a/src/test/util_sds_check/TEST3 b/src/test/util_sds_check/TEST3 index d3ccc46cde..fd6986146f 100755 --- a/src/test/util_sds_check/TEST3 +++ b/src/test/util_sds_check/TEST3 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_invalid_uuid diff --git a/src/test/util_sds_check/TEST4 b/src/test/util_sds_check/TEST4 index 6026bf7be4..e605196b84 100755 --- a/src/test/util_sds_check/TEST4 +++ b/src/test/util_sds_check/TEST4 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_invalid_uuid_set_dirty diff --git a/src/test/util_sds_check/TEST5 b/src/test/util_sds_check/TEST5 index a15d99599b..463983acd2 100755 --- a/src/test/util_sds_check/TEST5 +++ b/src/test/util_sds_check/TEST5 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_invalid_usc diff --git a/src/test/util_sds_check/TEST6 b/src/test/util_sds_check/TEST6 index e138f6a938..bc457eba7b 100755 --- a/src/test/util_sds_check/TEST6 +++ b/src/test/util_sds_check/TEST6 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_invalid_usc_set_dirty diff --git a/src/test/util_sds_check/TEST7 b/src/test/util_sds_check/TEST7 index 2b5142c911..0f86f783b0 100755 --- a/src/test/util_sds_check/TEST7 +++ b/src/test/util_sds_check/TEST7 @@ -14,8 +14,6 @@ require_fs_type none require_build_type debug -require_sds ./util_sds_check - setup expect_normal_exit ./util_sds_check test_happy_day