public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: Dave Chinner <david@fromorbit.com>, "Theodore Ts'o" <tytso@mit.edu>
Subject: [PATCH 2/2] generic/530: only use xfs-specific mkfs options when testing on xfs
Date: Sun, 15 Dec 2024 00:12:42 -0500	[thread overview]
Message-ID: <20241215051242.3340572-3-tytso@mit.edu> (raw)
In-Reply-To: <20241215051242.3340572-1-tytso@mit.edu>

This fixes a regression introduced by commit 000813899afb ("fstests:
scale some tests for high CPU count sanity") where this test
unconditionally tried to use the mkfs option "-l size=256m" which
would break when testing any file sytem other than xfs.

Fix this the same way commit 000813899afb dealt with this for
generic/531; so this was just an oversight.

Fixes: 000813899afb ("fstests: scale some tests for high CPU count sanity")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 tests/generic/530 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/generic/530 b/tests/generic/530
index 18256b870..06d7532f0 100755
--- a/tests/generic/530
+++ b/tests/generic/530
@@ -22,7 +22,11 @@ _require_scratch_shutdown
 _require_metadata_journaling
 _require_test_program "t_open_tmpfiles"
 
-_scratch_mkfs "-l size=256m" >> $seqres.full 2>&1
+if [ $FSTYP = "xfs" ]; then
+    _scratch_mkfs "-l size=256m" >> $seqres.full 2>&1
+else
+    _scratch_mkfs >> $seqres.full 2>&1
+fi
 _scratch_mount
 
 # Set ULIMIT_NOFILE to min(file-max / 2, 50000 files per LOAD_FACTOR)
-- 
2.45.2


  parent reply	other threads:[~2024-12-15  5:12 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-15  5:12 [PATCH 0/2] Fix recent regressions from for_next Theodore Ts'o
2024-12-15  5:12 ` [PATCH 1/2] generic/135: don't try to rm $SCRATCH_MNT/* Theodore Ts'o
2024-12-17  8:11   ` Christoph Hellwig
2024-12-15  5:12 ` Theodore Ts'o [this message]
2024-12-17  8:11   ` [PATCH 2/2] generic/530: only use xfs-specific mkfs options when testing on xfs Christoph Hellwig
2024-12-18 22:26     ` Dave Chinner
2024-12-19  5:37       ` Christoph Hellwig
2024-12-19 10:16         ` Zorro Lang
2024-12-19 16:32           ` Darrick J. Wong
2024-12-19 20:49             ` Dave Chinner
2024-12-19 22:53               ` Darrick J. Wong
2024-12-20 15:11                 ` Eric Sandeen
2024-12-22 12:22                 ` Zorro Lang
2024-12-22 14:22                   ` Zorro Lang
2024-12-18 22:26 ` [PATCH 0/2] Fix recent regressions from for_next Dave Chinner

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=20241215051242.3340572-3-tytso@mit.edu \
    --to=tytso@mit.edu \
    --cc=david@fromorbit.com \
    --cc=fstests@vger.kernel.org \
    /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