* [PATCH 1/3] overlay: run unionmount testsuite test cases
2020-05-31 11:01 [PATCH 0/3] Running unionmount testsuite from xfstests Amir Goldstein
@ 2020-05-31 11:01 ` Amir Goldstein
2020-05-31 11:01 ` [PATCH 2/3] overlay: add unionmount tests with multi lower layers Amir Goldstein
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Amir Goldstein @ 2020-05-31 11:01 UTC (permalink / raw)
To: Eryu Guan; +Cc: Miklos Szeredi, Vivek Goyal, linux-unionfs, fstests
Add support for running unionmount-testsuite from xfstests.
This requires that unionmount-testsuite is installed under src dir or
that UNIONMOUNT_TESTSUITE variable points to the location of the
testsuite. It also requires a recent version of unionmount-testsuite
that supports setting basedir path via UNIONMOUNT_* environment variables.
Add tests for three basic configurations:
1. overlay with upper/lower on same fs
2. overlay with upper/lower not on same fs without xino
3. overlay with upper/lower not on same fs with xino
The samefs test uses scratch partition for lower/upper layers.
The non samefs tests use the scratch partition for upper layer and the
test partition for lower layer.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
README.overlay | 15 ++++++++++++
common/config | 2 ++
common/overlay | 54 +++++++++++++++++++++++++++++++++++++++++++
tests/overlay/100 | 38 ++++++++++++++++++++++++++++++
tests/overlay/100.out | 2 ++
tests/overlay/101 | 39 +++++++++++++++++++++++++++++++
tests/overlay/101.out | 2 ++
tests/overlay/102 | 40 ++++++++++++++++++++++++++++++++
tests/overlay/102.out | 2 ++
tests/overlay/group | 3 +++
10 files changed, 197 insertions(+)
create mode 100755 tests/overlay/100
create mode 100644 tests/overlay/100.out
create mode 100755 tests/overlay/101
create mode 100644 tests/overlay/101.out
create mode 100755 tests/overlay/102
create mode 100644 tests/overlay/102.out
diff --git a/README.overlay b/README.overlay
index 30b5ddb2..39e25ada 100644
--- a/README.overlay
+++ b/README.overlay
@@ -50,3 +50,18 @@ In the example above, MOUNT_OPTIONS will be used to mount the base scratch fs,
TEST_FS_MOUNT_OPTS will be used to mount the base test fs,
OVERLAY_MOUNT_OPTIONS will be used to mount both test and scratch overlay and
OVERLAY_FSCK_OPTIONS will be used to check both test and scratch overlay.
+
+
+Unionmount Testsuite
+====================
+
+xfstests can be used as a test harness to run unionmount testsuite test cases
+and provide extended test coverage for overlayfs.
+
+To enable running unionmount testsuite, clone the git repository from:
+ https://github.com/amir73il/unionmount-testsuite.git
+under the xfstests src directory, or set the environment variable
+UNIONMOUNT_TESTSUITE to the local path where the repository was cloned.
+
+Run './check -overlay -g overlay/union' to execute all the unionmount testsuite
+test cases.
diff --git a/common/config b/common/config
index 8023273d..e356bcda 100644
--- a/common/config
+++ b/common/config
@@ -71,6 +71,8 @@ export OVL_LOWER="ovl-lower"
export OVL_WORK="ovl-work"
# overlay mount point parent must be the base fs root
export OVL_MNT="ovl-mnt"
+# By default unionmount-testsuite is expected under src
+export UNIONMOUNT_TESTSUITE=${UNIONMOUNT_TESTSUITE:=$here/src/unionmount-testsuite}
# From e2fsprogs/e2fsck/e2fsck.h:
# Exit code used by fsck-type programs
diff --git a/common/overlay b/common/overlay
index f8e1e27f..5e6a7e0f 100644
--- a/common/overlay
+++ b/common/overlay
@@ -363,3 +363,57 @@ _repair_overlay_scratch_fs()
esac
return $res
}
+
+# This test requires that unionmount testsuite is installed at
+# $UNIONMOUNT_TESTSUITE and that it supports configuring layers and overlay
+# mount paths via UNIONMOUNT_* environment variables.
+_require_unionmount_testsuite()
+{
+ [ -x "$UNIONMOUNT_TESTSUITE/run" ] || \
+ _notrun "unionmount testsuite required."
+
+ # Verify that UNIONMOUNT_* vars are supported
+ local usage=`UNIONMOUNT_BASEDIR=_ "$UNIONMOUNT_TESTSUITE/run" 2>&1`
+ echo $usage | grep -wq "UNIONMOUNT_BASEDIR" || \
+ _notrun "newer version of unionmount testsuite required."
+}
+
+_unionmount_testsuite_run()
+{
+ [ "$FSTYP" = overlay ] || \
+ _notrun "Filesystem $FSTYP not supported with unionmount testsuite."
+
+ # Provide the mounted base fs for upper and lower dirs and the
+ # overlay mount point.
+ # unionmount testsuite will perform the overlay mount.
+ # test fs is used for lower layer in non-samefs runs.
+ # scratch fs is used for upper layer in non-samefs runs and
+ # for both layers in samefs runs.
+ if (echo $* | grep -qv samefs) ; then
+ _overlay_base_test_mount
+ export UNIONMOUNT_LOWERDIR=$OVL_BASE_TEST_DIR/union
+ fi
+ export UNIONMOUNT_BASEDIR=$OVL_BASE_SCRATCH_MNT/union
+
+ _scratch_mkfs
+ rm -rf $UNIONMOUNT_BASEDIR $UNIONMOUNT_LOWERDIR
+ mkdir -p $UNIONMOUNT_BASEDIR $UNIONMOUNT_LOWERDIR
+
+ cd $UNIONMOUNT_TESTSUITE
+ echo "run $* ..." > $seqres.full
+ ./run $* >> $seqres.full || \
+ echo "unionmount testsuite failed! see $seqres.full for details."
+}
+
+_unionmount_testsuite_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+
+ [ -n "$UNIONMOUNT_BASEDIR" ] || return 0
+
+ # Cleanup overlay mount after unionmount testsuite run
+ cd $UNIONMOUNT_TESTSUITE
+ echo "run --clean-up ..." >> $seqres.full
+ ./run --clean-up >> $seqres.full 2>&1
+}
diff --git a/tests/overlay/100 b/tests/overlay/100
new file mode 100755
index 00000000..a2e82dfa
--- /dev/null
+++ b/tests/overlay/100
@@ -0,0 +1,38 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 100
+#
+# Run unionmount testsuite to verify correctness
+# with single lower layer on same fs as upper
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov --samefs --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/100.out b/tests/overlay/100.out
new file mode 100644
index 00000000..798c0136
--- /dev/null
+++ b/tests/overlay/100.out
@@ -0,0 +1,2 @@
+QA output created by 100
+Silence is golden
diff --git a/tests/overlay/101 b/tests/overlay/101
new file mode 100755
index 00000000..2b3a75d4
--- /dev/null
+++ b/tests/overlay/101
@@ -0,0 +1,39 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 101
+#
+# Run unionmount testsuite to verify correctness
+# with single lower layer not on same fs as upper
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/101.out b/tests/overlay/101.out
new file mode 100644
index 00000000..e651a915
--- /dev/null
+++ b/tests/overlay/101.out
@@ -0,0 +1,2 @@
+QA output created by 101
+Silence is golden
diff --git a/tests/overlay/102 b/tests/overlay/102
new file mode 100755
index 00000000..2dddbe50
--- /dev/null
+++ b/tests/overlay/102
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 102
+#
+# Run unionmount testsuite to verify correctness
+# with single lower layer not on same fs as upper
+# with xino enabled
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/102.out b/tests/overlay/102.out
new file mode 100644
index 00000000..86dd1f96
--- /dev/null
+++ b/tests/overlay/102.out
@@ -0,0 +1,2 @@
+QA output created by 102
+Silence is golden
diff --git a/tests/overlay/group b/tests/overlay/group
index 0cebcad0..267161f4 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -77,3 +77,6 @@
072 auto quick copyup hardlink
073 auto quick whiteout
074 auto quick exportfs dangerous
+100 auto quick union samefs
+101 auto quick union nonsamefs
+102 auto quick union nonsamefs xino
--
2.17.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/3] overlay: add unionmount tests with multi lower layers
2020-05-31 11:01 [PATCH 0/3] Running unionmount testsuite from xfstests Amir Goldstein
2020-05-31 11:01 ` [PATCH 1/3] overlay: run unionmount testsuite test cases Amir Goldstein
@ 2020-05-31 11:01 ` Amir Goldstein
2020-05-31 11:01 ` [PATCH 3/3] overlay: add unionmount tests with nested overlay Amir Goldstein
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Amir Goldstein @ 2020-05-31 11:01 UTC (permalink / raw)
To: Eryu Guan; +Cc: Miklos Szeredi, Vivek Goyal, linux-unionfs, fstests
The tests with multi lower layers rotate the upper layer into a lower
layer on specific operations such as mkdir, rename and link.
That provides test coverage for redirect_dir and index features.
The following variations are covered:
1. All layers all on scratch fs (--ov=10 --samefs)
2. All layers on scratch fs expect for lowermost on test fs (--ov=10)
3. Lowermost layer on test fs, one layer on tmpfs and the rest
on sratch fs (--ov=10 --maxfs=1)
4. Lowermost layer on test fs, one layer on scratch fs and the rest
are unique tmpfs instances (--ov=10 --maxfs=10)
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
tests/overlay/103 | 38 ++++++++++++++++++++++++++++++++++++++
tests/overlay/103.out | 2 ++
tests/overlay/104 | 39 +++++++++++++++++++++++++++++++++++++++
tests/overlay/104.out | 2 ++
tests/overlay/105 | 40 ++++++++++++++++++++++++++++++++++++++++
tests/overlay/105.out | 2 ++
tests/overlay/106 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/106.out | 2 ++
tests/overlay/107 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/107.out | 2 ++
tests/overlay/108 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/108.out | 2 ++
tests/overlay/109 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/109.out | 2 ++
tests/overlay/group | 7 +++++++
15 files changed, 302 insertions(+)
create mode 100755 tests/overlay/103
create mode 100644 tests/overlay/103.out
create mode 100755 tests/overlay/104
create mode 100644 tests/overlay/104.out
create mode 100755 tests/overlay/105
create mode 100644 tests/overlay/105.out
create mode 100755 tests/overlay/106
create mode 100644 tests/overlay/106.out
create mode 100755 tests/overlay/107
create mode 100644 tests/overlay/107.out
create mode 100755 tests/overlay/108
create mode 100644 tests/overlay/108.out
create mode 100755 tests/overlay/109
create mode 100644 tests/overlay/109.out
diff --git a/tests/overlay/103 b/tests/overlay/103
new file mode 100755
index 00000000..fb7fce0c
--- /dev/null
+++ b/tests/overlay/103
@@ -0,0 +1,38 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 103
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers on same fs as upper
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --samefs --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/103.out b/tests/overlay/103.out
new file mode 100644
index 00000000..78212a3d
--- /dev/null
+++ b/tests/overlay/103.out
@@ -0,0 +1,2 @@
+QA output created by 103
+Silence is golden
diff --git a/tests/overlay/104 b/tests/overlay/104
new file mode 100755
index 00000000..f867f345
--- /dev/null
+++ b/tests/overlay/104
@@ -0,0 +1,39 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 104
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, lowermost on unique fs
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/104.out b/tests/overlay/104.out
new file mode 100644
index 00000000..3f3bd2e8
--- /dev/null
+++ b/tests/overlay/104.out
@@ -0,0 +1,2 @@
+QA output created by 104
+Silence is golden
diff --git a/tests/overlay/105 b/tests/overlay/105
new file mode 100755
index 00000000..f964c58e
--- /dev/null
+++ b/tests/overlay/105
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 105
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, lowermost on unique fs,
+# with xino enabled
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/105.out b/tests/overlay/105.out
new file mode 100644
index 00000000..edaafd46
--- /dev/null
+++ b/tests/overlay/105.out
@@ -0,0 +1,2 @@
+QA output created by 105
+Silence is golden
diff --git a/tests/overlay/106 b/tests/overlay/106
new file mode 100755
index 00000000..52d6c7d0
--- /dev/null
+++ b/tests/overlay/106
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 106
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, some layers on unique fs,
+# one layer is on tmpfs.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_tmpfs
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --maxfs=1 --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/106.out b/tests/overlay/106.out
new file mode 100644
index 00000000..85af05d8
--- /dev/null
+++ b/tests/overlay/106.out
@@ -0,0 +1,2 @@
+QA output created by 106
+Silence is golden
diff --git a/tests/overlay/107 b/tests/overlay/107
new file mode 100755
index 00000000..abcde30c
--- /dev/null
+++ b/tests/overlay/107
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 107
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, some layers on unique fs,
+# one layer is on tmpfs with xino enabled.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_tmpfs
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --maxfs=1 --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/107.out b/tests/overlay/107.out
new file mode 100644
index 00000000..862bdfbd
--- /dev/null
+++ b/tests/overlay/107.out
@@ -0,0 +1,2 @@
+QA output created by 107
+Silence is golden
diff --git a/tests/overlay/108 b/tests/overlay/108
new file mode 100755
index 00000000..d4e9b570
--- /dev/null
+++ b/tests/overlay/108
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 108
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, all layers on unique fs,
+# some layers are on tmpfs.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_tmpfs
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --maxfs=10 --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/108.out b/tests/overlay/108.out
new file mode 100644
index 00000000..326ffa96
--- /dev/null
+++ b/tests/overlay/108.out
@@ -0,0 +1,2 @@
+QA output created by 108
+Silence is golden
diff --git a/tests/overlay/109 b/tests/overlay/109
new file mode 100755
index 00000000..71072982
--- /dev/null
+++ b/tests/overlay/109
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 109
+#
+# Run unionmount testsuite to verify correctness
+# with multi lower layers, all layers on unique fs,
+# some layers are on tmpfs with xino enabled.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_tmpfs
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ov=10 --maxfs=10 --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/109.out b/tests/overlay/109.out
new file mode 100644
index 00000000..8356befa
--- /dev/null
+++ b/tests/overlay/109.out
@@ -0,0 +1,2 @@
+QA output created by 109
+Silence is golden
diff --git a/tests/overlay/group b/tests/overlay/group
index 267161f4..079ff0af 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -80,3 +80,10 @@
100 auto quick union samefs
101 auto quick union nonsamefs
102 auto quick union nonsamefs xino
+103 auto union rotate samefs
+104 auto union rotate nonsamefs
+105 auto union rotate nonsamefs xino
+106 auto union rotate nonsamefs
+107 auto union rotate nonsamefs xino
+108 auto union rotate nonsamefs
+109 auto union rotate nonsamefs xino
--
2.17.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/3] overlay: add unionmount tests with nested overlay
2020-05-31 11:01 [PATCH 0/3] Running unionmount testsuite from xfstests Amir Goldstein
2020-05-31 11:01 ` [PATCH 1/3] overlay: run unionmount testsuite test cases Amir Goldstein
2020-05-31 11:01 ` [PATCH 2/3] overlay: add unionmount tests with multi lower layers Amir Goldstein
@ 2020-05-31 11:01 ` Amir Goldstein
2020-06-01 17:52 ` [PATCH 0/3] Running unionmount testsuite from xfstests Vivek Goyal
2020-07-19 18:11 ` Eryu Guan
4 siblings, 0 replies; 10+ messages in thread
From: Amir Goldstein @ 2020-05-31 11:01 UTC (permalink / raw)
To: Eryu Guan; +Cc: Miklos Szeredi, Vivek Goyal, linux-unionfs, fstests
These tests use an overlay mount as lower layer for a nested overlay.
That provides test coverage for a lower layer with null uuid and
lower layer with real inode numbers that use the high xino bits.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
tests/overlay/110 | 39 +++++++++++++++++++++++++++++++++++++++
tests/overlay/110.out | 2 ++
tests/overlay/111 | 40 ++++++++++++++++++++++++++++++++++++++++
tests/overlay/111.out | 2 ++
tests/overlay/112 | 40 ++++++++++++++++++++++++++++++++++++++++
tests/overlay/112.out | 2 ++
tests/overlay/113 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/113.out | 2 ++
tests/overlay/114 | 39 +++++++++++++++++++++++++++++++++++++++
tests/overlay/114.out | 2 ++
tests/overlay/115 | 40 ++++++++++++++++++++++++++++++++++++++++
tests/overlay/115.out | 2 ++
tests/overlay/116 | 40 ++++++++++++++++++++++++++++++++++++++++
tests/overlay/116.out | 2 ++
tests/overlay/117 | 41 +++++++++++++++++++++++++++++++++++++++++
tests/overlay/117.out | 2 ++
tests/overlay/group | 8 ++++++++
17 files changed, 344 insertions(+)
create mode 100755 tests/overlay/110
create mode 100644 tests/overlay/110.out
create mode 100755 tests/overlay/111
create mode 100644 tests/overlay/111.out
create mode 100755 tests/overlay/112
create mode 100644 tests/overlay/112.out
create mode 100755 tests/overlay/113
create mode 100644 tests/overlay/113.out
create mode 100755 tests/overlay/114
create mode 100644 tests/overlay/114.out
create mode 100755 tests/overlay/115
create mode 100644 tests/overlay/115.out
create mode 100755 tests/overlay/116
create mode 100644 tests/overlay/116.out
create mode 100755 tests/overlay/117
create mode 100644 tests/overlay/117.out
diff --git a/tests/overlay/110 b/tests/overlay/110
new file mode 100755
index 00000000..8d34f23e
--- /dev/null
+++ b/tests/overlay/110
@@ -0,0 +1,39 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 110
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with single lower overlay layer, whose layers are
+# on same fs
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov --samefs --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/110.out b/tests/overlay/110.out
new file mode 100644
index 00000000..4284b8b0
--- /dev/null
+++ b/tests/overlay/110.out
@@ -0,0 +1,2 @@
+QA output created by 110
+Silence is golden
diff --git a/tests/overlay/111 b/tests/overlay/111
new file mode 100755
index 00000000..b99f94da
--- /dev/null
+++ b/tests/overlay/111
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 111
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with single lower overlay layer, whose layers are
+# on same fs
+# with xino enabled (xino overflow not expected)
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov --samefs --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/111.out b/tests/overlay/111.out
new file mode 100644
index 00000000..fedcd590
--- /dev/null
+++ b/tests/overlay/111.out
@@ -0,0 +1,2 @@
+QA output created by 111
+Silence is golden
diff --git a/tests/overlay/112 b/tests/overlay/112
new file mode 100755
index 00000000..5e8f980b
--- /dev/null
+++ b/tests/overlay/112
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 112
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with single lower overlay layer, whose layers are
+# not on same fs
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/112.out b/tests/overlay/112.out
new file mode 100644
index 00000000..0f75273b
--- /dev/null
+++ b/tests/overlay/112.out
@@ -0,0 +1,2 @@
+QA output created by 112
+Silence is golden
diff --git a/tests/overlay/113 b/tests/overlay/113
new file mode 100755
index 00000000..b865f364
--- /dev/null
+++ b/tests/overlay/113
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 113
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with single lower overlay layer, whose layers are
+# not on same fs
+# with xino enabled (expected xino overflows)
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/113.out b/tests/overlay/113.out
new file mode 100644
index 00000000..5cdea7de
--- /dev/null
+++ b/tests/overlay/113.out
@@ -0,0 +1,2 @@
+QA output created by 113
+Silence is golden
diff --git a/tests/overlay/114 b/tests/overlay/114
new file mode 100755
index 00000000..fc783f57
--- /dev/null
+++ b/tests/overlay/114
@@ -0,0 +1,39 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 114
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with multi lower layers, lowermost is an overlay layer,
+# whose layers are on same fs
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov=10 --samefs --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/114.out b/tests/overlay/114.out
new file mode 100644
index 00000000..a2aa4a21
--- /dev/null
+++ b/tests/overlay/114.out
@@ -0,0 +1,2 @@
+QA output created by 114
+Silence is golden
diff --git a/tests/overlay/115 b/tests/overlay/115
new file mode 100755
index 00000000..b82128d6
--- /dev/null
+++ b/tests/overlay/115
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 115
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with multi lower layers, lowermost is an overlay layer,
+# whose layers are on same fs
+# with xino enabled (xino overflow not expected)
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov=10 --samefs --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/115.out b/tests/overlay/115.out
new file mode 100644
index 00000000..d9dd136f
--- /dev/null
+++ b/tests/overlay/115.out
@@ -0,0 +1,2 @@
+QA output created by 115
+Silence is golden
diff --git a/tests/overlay/116 b/tests/overlay/116
new file mode 100755
index 00000000..1575bece
--- /dev/null
+++ b/tests/overlay/116
@@ -0,0 +1,40 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 116
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with multi lower layers, lowermost is an overlay layer,
+# whose layers are not on same fs
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov=10 --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/116.out b/tests/overlay/116.out
new file mode 100644
index 00000000..a2013bc3
--- /dev/null
+++ b/tests/overlay/116.out
@@ -0,0 +1,2 @@
+QA output created by 116
+Silence is golden
diff --git a/tests/overlay/117 b/tests/overlay/117
new file mode 100755
index 00000000..819edc9b
--- /dev/null
+++ b/tests/overlay/117
@@ -0,0 +1,41 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020 CTERA Networks. All Rights Reserved.
+#
+# FS QA Test 117
+#
+# Run unionmount testsuite on a nested overlay filesystem
+# with multi lower layers, lowermost is an overlay layer,
+# whose layers are not on same fs
+# with xino enabled (expected xino overflows)
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_unionmount_testsuite_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+_supported_fs overlay
+_supported_os Linux
+_require_test
+_require_scratch
+_require_unionmount_testsuite
+
+_unionmount_testsuite_run --ovov=10 --xino --verify
+
+# success, all done
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/overlay/117.out b/tests/overlay/117.out
new file mode 100644
index 00000000..986c5152
--- /dev/null
+++ b/tests/overlay/117.out
@@ -0,0 +1,2 @@
+QA output created by 117
+Silence is golden
diff --git a/tests/overlay/group b/tests/overlay/group
index 079ff0af..047ea046 100644
--- a/tests/overlay/group
+++ b/tests/overlay/group
@@ -87,3 +87,11 @@
107 auto union rotate nonsamefs xino
108 auto union rotate nonsamefs
109 auto union rotate nonsamefs xino
+110 auto quick union nested samefs
+111 auto quick union nested samefs xino
+112 auto quick union nested nonsamefs
+113 auto quick union nested nonsamefs xino
+114 auto union rotate nested samefs
+115 auto union rotate nested samefs xino
+116 auto union rotate nested nonsamefs
+117 auto union rotate nested nonsamefs xino
--
2.17.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-05-31 11:01 [PATCH 0/3] Running unionmount testsuite from xfstests Amir Goldstein
` (2 preceding siblings ...)
2020-05-31 11:01 ` [PATCH 3/3] overlay: add unionmount tests with nested overlay Amir Goldstein
@ 2020-06-01 17:52 ` Vivek Goyal
2020-06-01 19:18 ` Amir Goldstein
2020-07-19 18:11 ` Eryu Guan
4 siblings, 1 reply; 10+ messages in thread
From: Vivek Goyal @ 2020-06-01 17:52 UTC (permalink / raw)
To: Amir Goldstein; +Cc: Eryu Guan, Miklos Szeredi, linux-unionfs, fstests
On Sun, May 31, 2020 at 02:01:53PM +0300, Amir Goldstein wrote:
> Eryu,
>
> unionmount testsuite has a lot more test coverage than the overlay
> xfstests, but it has a lot less exposure to testers.
>
> The various test setups that I have added to unionmount testsuite since
> I took over the maintanace of the testsuite have even smaller exposure
> to testers.
>
> These patches add overlay tests that are used as a harness to run
> different setups of unionmount testsuite. I have been using this method
> for over two year for testing my overlayfs branches.
Hi Amir,
Is there a git branch somewhere with these changes. Its easier to pull
that one in and test.
Vivek
>
> What does it take to install unionmount testsuite?
> As README.overlay says:
>
> git clone https://github.com/amir73il/unionmount-testsuite.git
> ln -s $PWD/unionmount-testsuite <path-to-xfstests>/src/
>
> Thanks,
> Amir.
>
> Amir Goldstein (3):
> overlay: run unionmount testsuite test cases
> overlay: add unionmount tests with multi lower layers
> overlay: add unionmount tests with nested overlay
>
> README.overlay | 15 ++++++++++++
> common/config | 2 ++
> common/overlay | 54 +++++++++++++++++++++++++++++++++++++++++++
> tests/overlay/100 | 38 ++++++++++++++++++++++++++++++
> tests/overlay/100.out | 2 ++
> tests/overlay/101 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/101.out | 2 ++
> tests/overlay/102 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/102.out | 2 ++
> tests/overlay/103 | 38 ++++++++++++++++++++++++++++++
> tests/overlay/103.out | 2 ++
> tests/overlay/104 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/104.out | 2 ++
> tests/overlay/105 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/105.out | 2 ++
> tests/overlay/106 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/106.out | 2 ++
> tests/overlay/107 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/107.out | 2 ++
> tests/overlay/108 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/108.out | 2 ++
> tests/overlay/109 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/109.out | 2 ++
> tests/overlay/110 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/110.out | 2 ++
> tests/overlay/111 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/111.out | 2 ++
> tests/overlay/112 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/112.out | 2 ++
> tests/overlay/113 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/113.out | 2 ++
> tests/overlay/114 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/114.out | 2 ++
> tests/overlay/115 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/115.out | 2 ++
> tests/overlay/116 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/116.out | 2 ++
> tests/overlay/117 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/117.out | 2 ++
> tests/overlay/group | 18 +++++++++++++++
> 40 files changed, 843 insertions(+)
> create mode 100755 tests/overlay/100
> create mode 100644 tests/overlay/100.out
> create mode 100755 tests/overlay/101
> create mode 100644 tests/overlay/101.out
> create mode 100755 tests/overlay/102
> create mode 100644 tests/overlay/102.out
> create mode 100755 tests/overlay/103
> create mode 100644 tests/overlay/103.out
> create mode 100755 tests/overlay/104
> create mode 100644 tests/overlay/104.out
> create mode 100755 tests/overlay/105
> create mode 100644 tests/overlay/105.out
> create mode 100755 tests/overlay/106
> create mode 100644 tests/overlay/106.out
> create mode 100755 tests/overlay/107
> create mode 100644 tests/overlay/107.out
> create mode 100755 tests/overlay/108
> create mode 100644 tests/overlay/108.out
> create mode 100755 tests/overlay/109
> create mode 100644 tests/overlay/109.out
> create mode 100755 tests/overlay/110
> create mode 100644 tests/overlay/110.out
> create mode 100755 tests/overlay/111
> create mode 100644 tests/overlay/111.out
> create mode 100755 tests/overlay/112
> create mode 100644 tests/overlay/112.out
> create mode 100755 tests/overlay/113
> create mode 100644 tests/overlay/113.out
> create mode 100755 tests/overlay/114
> create mode 100644 tests/overlay/114.out
> create mode 100755 tests/overlay/115
> create mode 100644 tests/overlay/115.out
> create mode 100755 tests/overlay/116
> create mode 100644 tests/overlay/116.out
> create mode 100755 tests/overlay/117
> create mode 100644 tests/overlay/117.out
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-06-01 17:52 ` [PATCH 0/3] Running unionmount testsuite from xfstests Vivek Goyal
@ 2020-06-01 19:18 ` Amir Goldstein
0 siblings, 0 replies; 10+ messages in thread
From: Amir Goldstein @ 2020-06-01 19:18 UTC (permalink / raw)
To: Vivek Goyal; +Cc: Eryu Guan, Miklos Szeredi, overlayfs, fstests
On Mon, Jun 1, 2020 at 8:52 PM Vivek Goyal <vgoyal@redhat.com> wrote:
>
> On Sun, May 31, 2020 at 02:01:53PM +0300, Amir Goldstein wrote:
> > Eryu,
> >
> > unionmount testsuite has a lot more test coverage than the overlay
> > xfstests, but it has a lot less exposure to testers.
> >
> > The various test setups that I have added to unionmount testsuite since
> > I took over the maintanace of the testsuite have even smaller exposure
> > to testers.
> >
> > These patches add overlay tests that are used as a harness to run
> > different setups of unionmount testsuite. I have been using this method
> > for over two year for testing my overlayfs branches.
>
> Hi Amir,
>
> Is there a git branch somewhere with these changes. Its easier to pull
> that one in and test.
>
Of course. Forgot to mention.
https://github.com/amir73il/xfstests/commits/unionmount
Thanks,
Amir.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-05-31 11:01 [PATCH 0/3] Running unionmount testsuite from xfstests Amir Goldstein
` (3 preceding siblings ...)
2020-06-01 17:52 ` [PATCH 0/3] Running unionmount testsuite from xfstests Vivek Goyal
@ 2020-07-19 18:11 ` Eryu Guan
2020-07-19 18:36 ` Amir Goldstein
4 siblings, 1 reply; 10+ messages in thread
From: Eryu Guan @ 2020-07-19 18:11 UTC (permalink / raw)
To: Amir Goldstein
Cc: Eryu Guan, Miklos Szeredi, Vivek Goyal, linux-unionfs, fstests
Hi Amir,
On Sun, May 31, 2020 at 02:01:53PM +0300, Amir Goldstein wrote:
> Eryu,
>
> unionmount testsuite has a lot more test coverage than the overlay
> xfstests, but it has a lot less exposure to testers.
>
> The various test setups that I have added to unionmount testsuite since
> I took over the maintanace of the testsuite have even smaller exposure
> to testers.
>
> These patches add overlay tests that are used as a harness to run
> different setups of unionmount testsuite. I have been using this method
> for over two year for testing my overlayfs branches.
>
> What does it take to install unionmount testsuite?
> As README.overlay says:
>
> git clone https://github.com/amir73il/unionmount-testsuite.git
> ln -s $PWD/unionmount-testsuite <path-to-xfstests>/src/
I'm really sorry for the long-long delay..
The test itself looks really good to me, my only concern is that
the updates in unionmount repo are not visible to fstests, and may cause
new failures, which are out of fstests' control. But I'm not sure if
this really is a problem for people.
I came up with two options anyway
- add unionmount tests as a submodule of fstests
- put unionmount tests in fstests
I'd like to hear what people think about this patchset, any other
comments & suggestions are welcomed!
Thanks,
Eryu
>
> Thanks,
> Amir.
>
> Amir Goldstein (3):
> overlay: run unionmount testsuite test cases
> overlay: add unionmount tests with multi lower layers
> overlay: add unionmount tests with nested overlay
>
> README.overlay | 15 ++++++++++++
> common/config | 2 ++
> common/overlay | 54 +++++++++++++++++++++++++++++++++++++++++++
> tests/overlay/100 | 38 ++++++++++++++++++++++++++++++
> tests/overlay/100.out | 2 ++
> tests/overlay/101 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/101.out | 2 ++
> tests/overlay/102 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/102.out | 2 ++
> tests/overlay/103 | 38 ++++++++++++++++++++++++++++++
> tests/overlay/103.out | 2 ++
> tests/overlay/104 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/104.out | 2 ++
> tests/overlay/105 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/105.out | 2 ++
> tests/overlay/106 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/106.out | 2 ++
> tests/overlay/107 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/107.out | 2 ++
> tests/overlay/108 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/108.out | 2 ++
> tests/overlay/109 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/109.out | 2 ++
> tests/overlay/110 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/110.out | 2 ++
> tests/overlay/111 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/111.out | 2 ++
> tests/overlay/112 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/112.out | 2 ++
> tests/overlay/113 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/113.out | 2 ++
> tests/overlay/114 | 39 +++++++++++++++++++++++++++++++
> tests/overlay/114.out | 2 ++
> tests/overlay/115 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/115.out | 2 ++
> tests/overlay/116 | 40 ++++++++++++++++++++++++++++++++
> tests/overlay/116.out | 2 ++
> tests/overlay/117 | 41 ++++++++++++++++++++++++++++++++
> tests/overlay/117.out | 2 ++
> tests/overlay/group | 18 +++++++++++++++
> 40 files changed, 843 insertions(+)
> create mode 100755 tests/overlay/100
> create mode 100644 tests/overlay/100.out
> create mode 100755 tests/overlay/101
> create mode 100644 tests/overlay/101.out
> create mode 100755 tests/overlay/102
> create mode 100644 tests/overlay/102.out
> create mode 100755 tests/overlay/103
> create mode 100644 tests/overlay/103.out
> create mode 100755 tests/overlay/104
> create mode 100644 tests/overlay/104.out
> create mode 100755 tests/overlay/105
> create mode 100644 tests/overlay/105.out
> create mode 100755 tests/overlay/106
> create mode 100644 tests/overlay/106.out
> create mode 100755 tests/overlay/107
> create mode 100644 tests/overlay/107.out
> create mode 100755 tests/overlay/108
> create mode 100644 tests/overlay/108.out
> create mode 100755 tests/overlay/109
> create mode 100644 tests/overlay/109.out
> create mode 100755 tests/overlay/110
> create mode 100644 tests/overlay/110.out
> create mode 100755 tests/overlay/111
> create mode 100644 tests/overlay/111.out
> create mode 100755 tests/overlay/112
> create mode 100644 tests/overlay/112.out
> create mode 100755 tests/overlay/113
> create mode 100644 tests/overlay/113.out
> create mode 100755 tests/overlay/114
> create mode 100644 tests/overlay/114.out
> create mode 100755 tests/overlay/115
> create mode 100644 tests/overlay/115.out
> create mode 100755 tests/overlay/116
> create mode 100644 tests/overlay/116.out
> create mode 100755 tests/overlay/117
> create mode 100644 tests/overlay/117.out
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-07-19 18:11 ` Eryu Guan
@ 2020-07-19 18:36 ` Amir Goldstein
2020-07-26 15:16 ` Eryu Guan
0 siblings, 1 reply; 10+ messages in thread
From: Amir Goldstein @ 2020-07-19 18:36 UTC (permalink / raw)
To: Eryu Guan; +Cc: Eryu Guan, Miklos Szeredi, Vivek Goyal, overlayfs, fstests
On Sun, Jul 19, 2020 at 9:11 PM Eryu Guan <guan@eryu.me> wrote:
>
> Hi Amir,
>
> On Sun, May 31, 2020 at 02:01:53PM +0300, Amir Goldstein wrote:
> > Eryu,
> >
> > unionmount testsuite has a lot more test coverage than the overlay
> > xfstests, but it has a lot less exposure to testers.
> >
> > The various test setups that I have added to unionmount testsuite since
> > I took over the maintanace of the testsuite have even smaller exposure
> > to testers.
> >
> > These patches add overlay tests that are used as a harness to run
> > different setups of unionmount testsuite. I have been using this method
> > for over two year for testing my overlayfs branches.
> >
> > What does it take to install unionmount testsuite?
> > As README.overlay says:
> >
> > git clone https://github.com/amir73il/unionmount-testsuite.git
> > ln -s $PWD/unionmount-testsuite <path-to-xfstests>/src/
>
> I'm really sorry for the long-long delay..
>
No worries.
> The test itself looks really good to me, my only concern is that
> the updates in unionmount repo are not visible to fstests, and may cause
> new failures, which are out of fstests' control. But I'm not sure if
> this really is a problem for people.
>
> I came up with two options anyway
> - add unionmount tests as a submodule of fstests
> - put unionmount tests in fstests
>
I suppose you mean git submodule?
IMO that's a fairly good option.
I suspect that some people would want to continue running
unionmount independently of xfstests and I have some development
branches, so it's convenient to keep the unionmount repo independent
of xfstests repo and use git submodule as the "pull request" method
between us, for keeping control of the flow of changes from my repo
in the hands of xfstests maintainer.
But as I wrote before, I am also fine with "handing over" the official
upstream of unionmount src to xfstests project and be the
"sub-maintainer" for that module, but I think there is going to be more
chatter with that option compared to the submodule option.
Another argument in favor of submodule, is that we can always
graduate unionmount in the future from submodule to built-in.
Thanks,
Amir.
> I'd like to hear what people think about this patchset, any other
> comments & suggestions are welcomed!
>
> Thanks,
> Eryu
>
> >
> > Thanks,
> > Amir.
> >
> > Amir Goldstein (3):
> > overlay: run unionmount testsuite test cases
> > overlay: add unionmount tests with multi lower layers
> > overlay: add unionmount tests with nested overlay
> >
> > README.overlay | 15 ++++++++++++
> > common/config | 2 ++
> > common/overlay | 54 +++++++++++++++++++++++++++++++++++++++++++
> > tests/overlay/100 | 38 ++++++++++++++++++++++++++++++
> > tests/overlay/100.out | 2 ++
> > tests/overlay/101 | 39 +++++++++++++++++++++++++++++++
> > tests/overlay/101.out | 2 ++
> > tests/overlay/102 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/102.out | 2 ++
> > tests/overlay/103 | 38 ++++++++++++++++++++++++++++++
> > tests/overlay/103.out | 2 ++
> > tests/overlay/104 | 39 +++++++++++++++++++++++++++++++
> > tests/overlay/104.out | 2 ++
> > tests/overlay/105 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/105.out | 2 ++
> > tests/overlay/106 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/106.out | 2 ++
> > tests/overlay/107 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/107.out | 2 ++
> > tests/overlay/108 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/108.out | 2 ++
> > tests/overlay/109 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/109.out | 2 ++
> > tests/overlay/110 | 39 +++++++++++++++++++++++++++++++
> > tests/overlay/110.out | 2 ++
> > tests/overlay/111 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/111.out | 2 ++
> > tests/overlay/112 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/112.out | 2 ++
> > tests/overlay/113 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/113.out | 2 ++
> > tests/overlay/114 | 39 +++++++++++++++++++++++++++++++
> > tests/overlay/114.out | 2 ++
> > tests/overlay/115 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/115.out | 2 ++
> > tests/overlay/116 | 40 ++++++++++++++++++++++++++++++++
> > tests/overlay/116.out | 2 ++
> > tests/overlay/117 | 41 ++++++++++++++++++++++++++++++++
> > tests/overlay/117.out | 2 ++
> > tests/overlay/group | 18 +++++++++++++++
> > 40 files changed, 843 insertions(+)
> > create mode 100755 tests/overlay/100
> > create mode 100644 tests/overlay/100.out
> > create mode 100755 tests/overlay/101
> > create mode 100644 tests/overlay/101.out
> > create mode 100755 tests/overlay/102
> > create mode 100644 tests/overlay/102.out
> > create mode 100755 tests/overlay/103
> > create mode 100644 tests/overlay/103.out
> > create mode 100755 tests/overlay/104
> > create mode 100644 tests/overlay/104.out
> > create mode 100755 tests/overlay/105
> > create mode 100644 tests/overlay/105.out
> > create mode 100755 tests/overlay/106
> > create mode 100644 tests/overlay/106.out
> > create mode 100755 tests/overlay/107
> > create mode 100644 tests/overlay/107.out
> > create mode 100755 tests/overlay/108
> > create mode 100644 tests/overlay/108.out
> > create mode 100755 tests/overlay/109
> > create mode 100644 tests/overlay/109.out
> > create mode 100755 tests/overlay/110
> > create mode 100644 tests/overlay/110.out
> > create mode 100755 tests/overlay/111
> > create mode 100644 tests/overlay/111.out
> > create mode 100755 tests/overlay/112
> > create mode 100644 tests/overlay/112.out
> > create mode 100755 tests/overlay/113
> > create mode 100644 tests/overlay/113.out
> > create mode 100755 tests/overlay/114
> > create mode 100644 tests/overlay/114.out
> > create mode 100755 tests/overlay/115
> > create mode 100644 tests/overlay/115.out
> > create mode 100755 tests/overlay/116
> > create mode 100644 tests/overlay/116.out
> > create mode 100755 tests/overlay/117
> > create mode 100644 tests/overlay/117.out
> >
> > --
> > 2.17.1
> >
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-07-19 18:36 ` Amir Goldstein
@ 2020-07-26 15:16 ` Eryu Guan
2020-07-26 16:21 ` Amir Goldstein
0 siblings, 1 reply; 10+ messages in thread
From: Eryu Guan @ 2020-07-26 15:16 UTC (permalink / raw)
To: Amir Goldstein; +Cc: Eryu Guan, Miklos Szeredi, Vivek Goyal, overlayfs, fstests
On Sun, Jul 19, 2020 at 09:36:39PM +0300, Amir Goldstein wrote:
> On Sun, Jul 19, 2020 at 9:11 PM Eryu Guan <guan@eryu.me> wrote:
> >
> > Hi Amir,
> >
> > On Sun, May 31, 2020 at 02:01:53PM +0300, Amir Goldstein wrote:
> > > Eryu,
> > >
> > > unionmount testsuite has a lot more test coverage than the overlay
> > > xfstests, but it has a lot less exposure to testers.
> > >
> > > The various test setups that I have added to unionmount testsuite since
> > > I took over the maintanace of the testsuite have even smaller exposure
> > > to testers.
> > >
> > > These patches add overlay tests that are used as a harness to run
> > > different setups of unionmount testsuite. I have been using this method
> > > for over two year for testing my overlayfs branches.
> > >
> > > What does it take to install unionmount testsuite?
> > > As README.overlay says:
> > >
> > > git clone https://github.com/amir73il/unionmount-testsuite.git
> > > ln -s $PWD/unionmount-testsuite <path-to-xfstests>/src/
> >
> > I'm really sorry for the long-long delay..
> >
>
> No worries.
>
> > The test itself looks really good to me, my only concern is that
> > the updates in unionmount repo are not visible to fstests, and may cause
> > new failures, which are out of fstests' control. But I'm not sure if
> > this really is a problem for people.
> >
> > I came up with two options anyway
> > - add unionmount tests as a submodule of fstests
> > - put unionmount tests in fstests
> >
>
> I suppose you mean git submodule?
Exactly.
But I think I'd merge it as-is, git submodule brings more maintain
burden on both maintainers and users, especially users that usually
don't care about overlay tests. Users that care about overlay tests
should setup unionmount tests explicitly and know that's unionmount
tests if there's any test failure.
> IMO that's a fairly good option.
> I suspect that some people would want to continue running
> unionmount independently of xfstests and I have some development
> branches, so it's convenient to keep the unionmount repo independent
> of xfstests repo and use git submodule as the "pull request" method
> between us, for keeping control of the flow of changes from my repo
> in the hands of xfstests maintainer.
>
> But as I wrote before, I am also fine with "handing over" the official
> upstream of unionmount src to xfstests project and be the
> "sub-maintainer" for that module, but I think there is going to be more
> chatter with that option compared to the submodule option.
> Another argument in favor of submodule, is that we can always
> graduate unionmount in the future from submodule to built-in.
Agreed, I think making unionmount tests a built-in would be good in the
future.
Thanks!
Eryu
>
> Thanks,
> Amir.
>
> > I'd like to hear what people think about this patchset, any other
> > comments & suggestions are welcomed!
> >
> > Thanks,
> > Eryu
> >
> > >
> > > Thanks,
> > > Amir.
> > >
> > > Amir Goldstein (3):
> > > overlay: run unionmount testsuite test cases
> > > overlay: add unionmount tests with multi lower layers
> > > overlay: add unionmount tests with nested overlay
> > >
> > > README.overlay | 15 ++++++++++++
> > > common/config | 2 ++
> > > common/overlay | 54 +++++++++++++++++++++++++++++++++++++++++++
> > > tests/overlay/100 | 38 ++++++++++++++++++++++++++++++
> > > tests/overlay/100.out | 2 ++
> > > tests/overlay/101 | 39 +++++++++++++++++++++++++++++++
> > > tests/overlay/101.out | 2 ++
> > > tests/overlay/102 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/102.out | 2 ++
> > > tests/overlay/103 | 38 ++++++++++++++++++++++++++++++
> > > tests/overlay/103.out | 2 ++
> > > tests/overlay/104 | 39 +++++++++++++++++++++++++++++++
> > > tests/overlay/104.out | 2 ++
> > > tests/overlay/105 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/105.out | 2 ++
> > > tests/overlay/106 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/106.out | 2 ++
> > > tests/overlay/107 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/107.out | 2 ++
> > > tests/overlay/108 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/108.out | 2 ++
> > > tests/overlay/109 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/109.out | 2 ++
> > > tests/overlay/110 | 39 +++++++++++++++++++++++++++++++
> > > tests/overlay/110.out | 2 ++
> > > tests/overlay/111 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/111.out | 2 ++
> > > tests/overlay/112 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/112.out | 2 ++
> > > tests/overlay/113 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/113.out | 2 ++
> > > tests/overlay/114 | 39 +++++++++++++++++++++++++++++++
> > > tests/overlay/114.out | 2 ++
> > > tests/overlay/115 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/115.out | 2 ++
> > > tests/overlay/116 | 40 ++++++++++++++++++++++++++++++++
> > > tests/overlay/116.out | 2 ++
> > > tests/overlay/117 | 41 ++++++++++++++++++++++++++++++++
> > > tests/overlay/117.out | 2 ++
> > > tests/overlay/group | 18 +++++++++++++++
> > > 40 files changed, 843 insertions(+)
> > > create mode 100755 tests/overlay/100
> > > create mode 100644 tests/overlay/100.out
> > > create mode 100755 tests/overlay/101
> > > create mode 100644 tests/overlay/101.out
> > > create mode 100755 tests/overlay/102
> > > create mode 100644 tests/overlay/102.out
> > > create mode 100755 tests/overlay/103
> > > create mode 100644 tests/overlay/103.out
> > > create mode 100755 tests/overlay/104
> > > create mode 100644 tests/overlay/104.out
> > > create mode 100755 tests/overlay/105
> > > create mode 100644 tests/overlay/105.out
> > > create mode 100755 tests/overlay/106
> > > create mode 100644 tests/overlay/106.out
> > > create mode 100755 tests/overlay/107
> > > create mode 100644 tests/overlay/107.out
> > > create mode 100755 tests/overlay/108
> > > create mode 100644 tests/overlay/108.out
> > > create mode 100755 tests/overlay/109
> > > create mode 100644 tests/overlay/109.out
> > > create mode 100755 tests/overlay/110
> > > create mode 100644 tests/overlay/110.out
> > > create mode 100755 tests/overlay/111
> > > create mode 100644 tests/overlay/111.out
> > > create mode 100755 tests/overlay/112
> > > create mode 100644 tests/overlay/112.out
> > > create mode 100755 tests/overlay/113
> > > create mode 100644 tests/overlay/113.out
> > > create mode 100755 tests/overlay/114
> > > create mode 100644 tests/overlay/114.out
> > > create mode 100755 tests/overlay/115
> > > create mode 100644 tests/overlay/115.out
> > > create mode 100755 tests/overlay/116
> > > create mode 100644 tests/overlay/116.out
> > > create mode 100755 tests/overlay/117
> > > create mode 100644 tests/overlay/117.out
> > >
> > > --
> > > 2.17.1
> > >
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] Running unionmount testsuite from xfstests
2020-07-26 15:16 ` Eryu Guan
@ 2020-07-26 16:21 ` Amir Goldstein
0 siblings, 0 replies; 10+ messages in thread
From: Amir Goldstein @ 2020-07-26 16:21 UTC (permalink / raw)
To: Eryu Guan; +Cc: Eryu Guan, Miklos Szeredi, Vivek Goyal, overlayfs, fstests
> >
> > > The test itself looks really good to me, my only concern is that
> > > the updates in unionmount repo are not visible to fstests, and may cause
> > > new failures, which are out of fstests' control. But I'm not sure if
> > > this really is a problem for people.
> > >
> > > I came up with two options anyway
> > > - add unionmount tests as a submodule of fstests
> > > - put unionmount tests in fstests
> > >
> >
> > I suppose you mean git submodule?
>
> Exactly.
>
> But I think I'd merge it as-is, git submodule brings more maintain
> burden on both maintainers and users, especially users that usually
> don't care about overlay tests. Users that care about overlay tests
> should setup unionmount tests explicitly and know that's unionmount
> tests if there's any test failure.
>
Great!
I see you also kept my 100+N test numbering, which is very convenient :-)
I have a patch on my dev branch to run unionmount test cases with
metacopy enabled that Vivek requested.
Will post it this week.
Thanks!
Amir.
^ permalink raw reply [flat|nested] 10+ messages in thread