Several tests check that index dir is empty after upper entries have
been unlinked. With nfs_export=on, index will contain a whiteout index
entry in that case so, allow chardevs when checking for clean index dir.
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
tests/overlay/033 | 8 ++++++--
tests/overlay/034 | 8 ++++++--
tests/overlay/048 | 4 +++-
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tests/overlay/033 b/tests/overlay/033
index 30780c6..3e67500 100755
--- a/tests/overlay/033
+++ b/tests/overlay/033
@@ -69,7 +69,6 @@ report_nlink()
# Create lower hardlinks
create_hardlinks()
{
- lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
mkdir -p $lowerdir
touch $lowerdir/0
ln $lowerdir/0 $lowerdir/1
@@ -123,9 +122,14 @@ test_hardlinks()
rm $SCRATCH_MNT/2
# Verify that orphan index is cleaned when dropping nlink to zero
- ls $OVL_BASE_SCRATCH_MNT/$OVL_WORK/index
+ # With nfs_export=on index will contain a whiteout index entry, so allow
+ # chardev entries in index dir.
+ find $workdir/index -mindepth 1 -type c -o -print
}
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
+
# Remove all files from previous tests
_scratch_mkfs
diff --git a/tests/overlay/034 b/tests/overlay/034
index dc354c6..d9f9798 100755
--- a/tests/overlay/034
+++ b/tests/overlay/034
@@ -67,11 +67,13 @@ _require_scratch
# Without overlay index feature hardlinks are broken on copy up
_require_scratch_feature index
+lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
+workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
+
# Remove all files from previous tests
_scratch_mkfs
# Create lower hardlink
-lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
mkdir -p $lowerdir
touch $lowerdir/0
ln $lowerdir/0 $lowerdir/1
@@ -103,7 +105,9 @@ rm $SCRATCH_MNT/4
# Verify that orphan index is cleaned on mount
_scratch_cycle_mount index=on
-ls $OVL_BASE_SCRATCH_MNT/$OVL_WORK/index
+# With nfs_export=on index will contain a whiteout index entry, so allow
+# chardev entries in index dir.
+find $workdir/index -mindepth 1 -type c -o -print
echo "Silence is golden"
status=0
diff --git a/tests/overlay/048 b/tests/overlay/048
index 4b2c58f..3ce6270 100755
--- a/tests/overlay/048
+++ b/tests/overlay/048
@@ -111,7 +111,9 @@ test_hardlinks_offline()
report_nlink "unlink last lower"
# Verify that orphan index is cleaned when dropping nlink to zero
- ls $workdir/index
+ # With nfs_export=on index will contain a whiteout index entry, so allow
+ # chardev entries in index dir.
+ find $workdir/index -mindepth 1 -type c -o -print
}
lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
