From: Erez Zadok Date: Sun, 26 Jun 2011 00:12:13 +0000 (-0400) Subject: Regression: skip rm/rmdir tests in t-cache on 2.6.38 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=56c755859fa498827d663d243784af74d5807861;p=unionfs-regression.git Regression: skip rm/rmdir tests in t-cache on 2.6.38 Because can no longer detect cache incoherency in 2.6.38. Signed-off-by: Erez Zadok --- diff --git a/t-cache.sh b/t-cache.sh old mode 100755 new mode 100644 index 54af6e9..8fb22d5 --- a/t-cache.sh +++ b/t-cache.sh @@ -73,16 +73,34 @@ function test_rm { rm -f $LOWER_DIR1/f1 || exit $? sync sleep 5 - test -f $MOUNTPOINT/f1 && exit $? - echo -n "[rm] " + case `uname -r` in + 2.6.3[89]* | 3.* ) + # 2.6.38+ no longer d-revalidates when lower inode is gone, so I + # cannot detect changes below + echo -n "[rm-SKIP] " + ;; + * ) + test -f $MOUNTPOINT/f1 && exit $? + echo -n "[rm] " + ;; + esac } function test_rmdir { rmdir $LOWER_DIR1/d1 || exit $? sync sleep 5 - test -d $MOUNTPOINT/d1 && exit $? - echo -n "[rmdir] " + case `uname -r` in + 2.6.3[89]* | 3.* ) + # 2.6.38 no longer d-revalidates when lower inode is gone, so I + # cannot detect changes below + echo -n "[rmdir-SKIP] " + ;; + * ) + test -d $MOUNTPOINT/d1 && exit $? + echo -n "[rmdir] " + ;; + esac } function test_append {