[PATCH 2/3] test-appliance: remove redudant overlay configs

FS/XFS testing framework
 help / color / mirror / Atom feed

From: Amir Goldstein <amir73il@gmail.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Eric Biggers <ebiggers@google.com>,
	Alexander Larsson <alexl@redhat.com>,
	Leah Rumancik <leah.rumancik@gmail.com>,
	fstests@vger.kernel.org, linux-unionfs@vger.kernel.org
Subject: [PATCH 2/3] test-appliance: remove redudant overlay configs
Date: Sun, 25 Jun 2023 16:50:32 +0300	[thread overview]
Message-ID: <20230625135033.3205742-3-amir73il@gmail.com> (raw)
In-Reply-To: <20230625135033.3205742-1-amir73il@gmail.com>

Since the introduction of syntax "-c ext4:overlay/small" - 5fec599
("test-appliance: update config syntax to specify primary fstype"),
there is no need for the -ext4 and -xfs ovelray config file variants,
so remove them.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 .../files/root/fs/overlay/cfg/large-ext4           | 14 --------------
 test-appliance/files/root/fs/overlay/cfg/large-xfs | 14 --------------
 .../files/root/fs/overlay/cfg/small-ext4           | 14 --------------
 .../files/root/fs/overlay/cfg/small-ext4.exclude   |  1 -
 test-appliance/files/root/fs/overlay/cfg/small-xfs | 14 --------------
 .../files/root/fs/overlay/cfg/small-xfs.exclude    |  1 -
 6 files changed, 58 deletions(-)
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-ext4
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-xfs
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs
 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude

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 e401147..0000000
--- 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 627dc29..0000000
--- 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 ce750e5..0000000
--- 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 a314778..0000000
--- 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 d0d8433..0000000
--- 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 a314778..0000000
--- 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.
-- 
2.34.1

next prev parent reply	other threads:[~2023-06-25 13:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-25 13:50 [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein
2023-06-25 13:50 ` [PATCH 1/3] test-appliance: enable verity for testing overlay over ext4 Amir Goldstein
2023-06-25 13:50 ` Amir Goldstein [this message]
2023-06-25 13:50 ` [PATCH 3/3] test-appliance: skip overlayfs tests from base fs exclude list Amir Goldstein
2023-08-27  9:05 ` [PATCH 0/3] fstests-bld overlayfs updates Amir Goldstein

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e401147 dfblob:627dc29 dfblob:ce750e5 dfblob:a314778
dfblob:d0d8433 dfblob:a314778 )
 OR (
bs:"[PATCH 2/3] test-appliance: remove redudant overlay configs" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230625135033.3205742-3-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=alexl@redhat.com \
    --cc=ebiggers@google.com \
    --cc=fstests@vger.kernel.org \
    --cc=leah.rumancik@gmail.com \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox