diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2023-10-22 21:31:31 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-10-22 21:31:31 -0400 |
| commit | 893add6a63646cb3472aa951f61f03c1222b5bf0 (patch) | |
| tree | 14710c87599d694eb2d9783d9e83178e8bad63eb | |
| parent | 3e1137d83cd274ceb52a1b9504915a949fe4936b (diff) | |
| parent | eafae13de96c7b76fd5a66ed3d9ca603ee846817 (diff) | |
| download | xfstests-bld-893add6a63646cb3472aa951f61f03c1222b5bf0.tar.gz | |
Merge branch 'ovl-fixes' of https://github.com/amir73il/xfstests-bld
8 files changed, 2 insertions, 59 deletions
diff --git a/test-appliance/files/root/fs/overlay/cfg/large-ext4 b/test-appliance/files/root/fs/overlay/cfg/large-ext4 deleted file mode 100644 index e401147d..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/large-ext4 +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=ext4 -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/large-xfs b/test-appliance/files/root/fs/overlay/cfg/large-xfs deleted file mode 100644 index 627dc295..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/large-xfs +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=xfs -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4 b/test-appliance/files/root/fs/overlay/cfg/small-ext4 deleted file mode 100644 index ce750e56..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-ext4 +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -SIZE=small -FSTESTTYP=ext4 -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude b/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude deleted file mode 100644 index a3147783..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude +++ /dev/null @@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV. diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs b/test-appliance/files/root/fs/overlay/cfg/small-xfs deleted file mode 100644 index d0d8433e..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-xfs +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -FSTESTTYP=xfs -SIZE=small -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude b/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude deleted file mode 100644 index a3147783..00000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude +++ /dev/null @@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV. diff --git a/test-appliance/files/root/fs/overlay/config b/test-appliance/files/root/fs/overlay/config index 7c50b19c..f252a700 100644 --- a/test-appliance/files/root/fs/overlay/config +++ b/test-appliance/files/root/fs/overlay/config @@ -55,7 +55,7 @@ function __mkfs() case "$BASE_FSTYPE" in ext4) - /sbin/mke2fs -F -q -t ext4 "$dev" + /sbin/mke2fs -F -q -t ext4 -O verity "$dev" ;; xfs) mkfs.xfs -f -m rmapbt=1,reflink=1 "$dev" diff --git a/test-appliance/files/root/runtests.sh b/test-appliance/files/root/runtests.sh index 9d2e213c..73a25573 100755 --- a/test-appliance/files/root/runtests.sh +++ b/test-appliance/files/root/runtests.sh @@ -577,6 +577,7 @@ do files=() for i in "/root/fs/global_exclude" \ "/root/fs/$FS/exclude" \ + "/root/fs/$BASE_FSTYPE/exclude" \ "/root/fs/$FS/cfg/$TC.exclude" \ "/root/fs/exclude.$XFSTESTS_FLAVOR" ; do test -f "$i" && files+=("$i") |