From 58dc06e8a435159bf50ecf04316d9ea014f9a008 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 30 Jan 2024 23:00:48 +0100 Subject: [PATCH] common: addjust tests match file for util_poolset tests Signed-off-by: Tomasz Gromadzki --- src/test/pmempool_transform/TEST10 | 5 ++++- src/test/pmempool_transform/TEST5 | 4 ++-- src/test/pmempool_transform/TEST6 | 4 ++-- src/test/util_poolset/grep1.log.match | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/test/pmempool_transform/TEST10 b/src/test/pmempool_transform/TEST10 index 23791430713..6d21fdce635 100755 --- a/src/test/pmempool_transform/TEST10 +++ b/src/test/pmempool_transform/TEST10 @@ -56,7 +56,10 @@ expect_abnormal_exit $PMEMPOOL$EXESUFFIX transform \ # Check metadata by pmempool info dump_pool_info $POOLSET_IN >> $LOG_TEMP -mv $LOG_TEMP $LOG +# Exclude warning messages printed out on the stderr by PMDK in debug +grep -v "*WARN*" $LOG_TEMP > $LOG +rm $LOG_TEMP + check pass diff --git a/src/test/pmempool_transform/TEST5 b/src/test/pmempool_transform/TEST5 index 929bd3838b5..8cbf7e86b42 100755 --- a/src/test/pmempool_transform/TEST5 +++ b/src/test/pmempool_transform/TEST5 @@ -92,8 +92,8 @@ dump_pool_info $DIR/testfile01 >> $LOG_TEMP dump_pool_info $DIR/testfile02 >> $LOG_TEMP dump_pool_info $DIR/testfile10 >> $LOG_TEMP -# Exclude error messages printed out on the stderr by PMDK in debug -fgrep -v "*ERROR*" $LOG_TEMP > $LOG +# Exclude error and warning messages printed out on the stderr by PMDK in debug +grep -v -E "\*ERROR\*|\*WARN\*" $LOG_TEMP > $LOG rm $LOG_TEMP check diff --git a/src/test/pmempool_transform/TEST6 b/src/test/pmempool_transform/TEST6 index 91bde3c12a8..a09722b3e0d 100755 --- a/src/test/pmempool_transform/TEST6 +++ b/src/test/pmempool_transform/TEST6 @@ -71,8 +71,8 @@ expect_abnormal_exit $PMEMPOOL$EXESUFFIX transform \ # Check metadata by pmempool info dump_pool_info $POOLSET_OUT1 >> $LOG_TEMP -# Exclude error messages printed out on the stderr by PMDK in debug -fgrep -v "*ERROR*" $LOG_TEMP > $LOG +# Exclude error and warning messages printed out on the stderr by PMDK in debug +grep -v -E "\*ERROR\*|\*WARN\*" $LOG_TEMP > $LOG rm $LOG_TEMP check diff --git a/src/test/util_poolset/grep1.log.match b/src/test/util_poolset/grep1.log.match index 20a69f0e9c7..388f7f6909f 100644 --- a/src/test/util_poolset/grep1.log.match +++ b/src/test/util_poolset/grep1.log.match @@ -11,9 +11,7 @@ open "$(nW)/testset0": No such file or directory invalid major version (0) open "$(nW)/testset2": Permission denied open "$(nW)/testfile31": No such file or directory -cannot open the part -- "$(nW)/testfile31": No such file or directory open "$(nW)/testfile32": No such file or directory -cannot open the part -- "$(nW)/testfile32": No such file or directory open "$(nW)/testfile31": No such file or directory open "$(nW)/testfile42": No such file or directory size 1048576 smaller than 2097152