test: revert exclusions needed for pmem#5988 pmem#5966

Signed-off-by: Jan Michalski <jan.michalski@intel.com>
janekmi · Feb 13, 2024 · 0422998 · 0422998
1 parent 6ac049b
commit 0422998
Show file tree

Hide file tree

Showing 39 changed files with 19 additions and 157 deletions.
diff --git a/src/test/ex_libpmemobj/TEST0 b/src/test/ex_libpmemobj/TEST0
@@ -22,9 +22,7 @@ EX_PATH=../../examples/libpmemobj
 expect_normal_exit $EX_PATH/pi $DIR/testfile1 c 2 20 > $LOG_TEMP 2>&1
 expect_normal_exit $EX_PATH/pi $DIR/testfile1 p >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/ex_libpmemobj/TEST1 b/src/test/ex_libpmemobj/TEST1
@@ -25,9 +25,7 @@ expect_normal_exit $EX_PATH/btree $DIR/testfile1 i 2 World! >> $LOG_TEMP 2>&1
 expect_normal_exit $EX_PATH/btree $DIR/testfile1 p >> $LOG_TEMP 2>&1
 expect_normal_exit $EX_PATH/btree $DIR/testfile1 f 4321 >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/ex_libpmemobj/TEST17 b/src/test/ex_libpmemobj/TEST17
@@ -26,9 +26,7 @@ expect_normal_exit $EX_PATH/lists $DIR/testfile1 2 bar print >> $LOG_TEMP 2>&1
 expect_normal_exit $EX_PATH/lists $DIR/testfile1 3 foo print >> $LOG_TEMP 2>&1
 expect_normal_exit $EX_PATH/lists $DIR/testfile1 1 bar print >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/ex_libpmemobj/TEST7 b/src/test/ex_libpmemobj/TEST7
@@ -24,9 +24,7 @@ EOF
 
 expect_normal_exit $EX_PATH/reader $DIR/testfile1 >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/ex_libpmemobj/TEST8 b/src/test/ex_libpmemobj/TEST8
@@ -24,9 +24,7 @@ EOF
 
 expect_normal_exit $EX_PATH/reader $DIR/testfile1 >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/ex_libpmemobj/TEST9 b/src/test/ex_libpmemobj/TEST9
@@ -23,9 +23,7 @@ EOF
 
 expect_normal_exit $EX_PATH/reader $DIR/testfile1 >> $LOG_TEMP 2>&1
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST10 b/src/test/pmempool_sync/TEST10
@@ -51,9 +51,7 @@ expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET2 >> $LOG_TEMP 2>&1
 # Check metadata using pmempool info
 dump_pool_info $POOLSET1 >> $LOG_TEMP
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST11 b/src/test/pmempool_sync/TEST11
@@ -61,9 +61,7 @@ expect_normal_exit $DDMAP$EXESUFFIX -o $DIR/part20 -n 10 -b 1
 # Try to synchronize replicas using the third poolset
 expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET3 &>> $LOG_TEMP
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST12 b/src/test/pmempool_sync/TEST12
@@ -44,9 +44,7 @@ expect_normal_exit $PMEMSPOIL $DIR/testfile1 pool_hdr.uuid=0000000000000000\
 # Try to synchronize replicas
 expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET &>> $LOG_TEMP
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST23 b/src/test/pmempool_sync/TEST23
@@ -63,9 +63,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET1 >> $LOG_TEMP
 # Check metadata using pmempool info
 dump_pool_info $POOLSET1 >> $LOG_TEMP
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 pass
diff --git a/src/test/pmempool_sync/TEST24 b/src/test/pmempool_sync/TEST24
@@ -60,9 +60,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET1 >> $LOG_TEMP
 # Check metadata using pmempool info
 dump_pool_info $POOLSET1 >> $LOG_TEMP
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST25 b/src/test/pmempool_sync/TEST25
@@ -62,9 +62,7 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET1 >> $LOG_TEMP
 # Check metadata using pmempool info
 dump_pool_info $POOLSET1 >> $LOG_TEMP
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST26 b/src/test/pmempool_sync/TEST26
@@ -47,9 +47,7 @@ expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET >> $LOG_TEMP 2>&1
 # Remove poolset
 expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET
 
-# Exclude error messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST29 b/src/test/pmempool_sync/TEST29
@@ -40,11 +40,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST32 b/src/test/pmempool_sync/TEST32
@@ -50,11 +50,6 @@ expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST33 b/src/test/pmempool_sync/TEST33
@@ -50,11 +50,6 @@ expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST34 b/src/test/pmempool_sync/TEST34
@@ -59,11 +59,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST35 b/src/test/pmempool_sync/TEST35
@@ -59,11 +59,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST36 b/src/test/pmempool_sync/TEST36
@@ -63,11 +63,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 # sync was uneable to fix bad blocks, because one recovery file was missing
 expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST37 b/src/test/pmempool_sync/TEST37
@@ -63,11 +63,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX sync -b -v $POOLSET >> $LOG"
 # sync was uneable to fix bad blocks, because one recovery file was missing
 expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST42 b/src/test/pmempool_sync/TEST42
@@ -62,11 +62,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST43 b/src/test/pmempool_sync/TEST43
@@ -63,11 +63,6 @@ expect_abnormal_exit "$PMEMPOOL$EXESUFFIX sync -v -b $POOLSET &>> $LOG"
 # pool verification should fail
 expect_abnormal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST44 b/src/test/pmempool_sync/TEST44
@@ -82,11 +82,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST45 b/src/test/pmempool_sync/TEST45
@@ -80,11 +80,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST46 b/src/test/pmempool_sync/TEST46
@@ -80,11 +80,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST47 b/src/test/pmempool_sync/TEST47
@@ -83,11 +83,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST48 b/src/test/pmempool_sync/TEST48
@@ -86,11 +86,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST49 b/src/test/pmempool_sync/TEST49
@@ -85,11 +85,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST50 b/src/test/pmempool_sync/TEST50
@@ -85,11 +85,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST51 b/src/test/pmempool_sync/TEST51
@@ -86,11 +86,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST52 b/src/test/pmempool_sync/TEST52
@@ -83,11 +83,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST53 b/src/test/pmempool_sync/TEST53
@@ -85,11 +85,6 @@ expect_normal_exit "$PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG"
 expect_normal_exit "$PMEMPOOL$EXESUFFIX info --bad-blocks=yes $POOLSET >> $LOG"
 expect_normal_exit "$OBJ_VERIFY$EXESUFFIX $POOLSET pmempool$SUFFIX v &>> $LOG"
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-LOG_TEMP=$LOG.log
-fgrep -v "*ERROR*" $LOG | fgrep -v "*WARN*" > $LOG_TEMP
-mv $LOG_TEMP $LOG
-
 check
 
 pass
diff --git a/src/test/pmempool_sync/TEST8 b/src/test/pmempool_sync/TEST8
@@ -55,9 +55,7 @@ rm -f $DIR/part11
 # Synchronize replicas using the second poolset
 expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET2 >> $LOG_TEMP 2>&1
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check
 

diff --git a/src/test/pmempool_sync/TEST9 b/src/test/pmempool_sync/TEST9
@@ -58,9 +58,7 @@ rm -f $DIR/part01
 # Try to synchronize replicas using the second poolset
 expect_abnormal_exit $PMEMPOOL$EXESUFFIX sync $POOLSET2 >> $LOG_TEMP 2>&1
 
-# Exclude error and warn messages printed out on the stderr by PMDK in debug
-fgrep -v "*ERROR*" $LOG_TEMP | fgrep -v "*WARN*" > $LOG
-rm $LOG_TEMP
+mv $LOG_TEMP $LOG
 
 check