summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Whitney <enwlinux@gmail.com>2022-10-21 17:19:50 -0400
committerZorro Lang <zlang@kernel.org>2022-11-06 20:11:27 +0800
commit41f2bbdec5faa5d6522e86e63c1f30473a99dbfe (patch)
treebb495f5f440d9596da46316d949c07ba2dfa7a0c
parent6994e033aba253cb2221e6412da4e44dc4526adf (diff)
generic: add missing $FSX_AVOID to fsx invocationsv2022.11.06
generic/455 fails when run on an ext4 bigalloc file system. Its fsx invocations can make insert range and collapse range calls whose arguments are not cluster aligned, and ext4 will fail those calls for bigalloc. They can be suppressed by adding the FSX_AVOID environment variable to the fsx invocation and setting its value appropriately in the test environment, as is done for other fsx-based tests. This avoids the need to exclude the test to avoid failures and makes it possible to take advantage of the remainder of its coverage. [ Also fix generic/457, as requested by Dave Chinner -- TYT] Signed-off-by: Eric Whitney <enwlinux@gmail.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-xtests/generic/4552
-rwxr-xr-xtests/generic/4572
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/generic/455 b/tests/generic/455
index 649b5410..c13d872c 100755
--- a/tests/generic/455
+++ b/tests/generic/455
@@ -77,7 +77,7 @@ FSX_OPTS="-N $NUM_OPS -d -P $SANITY_DIR -i $LOGWRITES_DMDEV"
seeds=(0 0 0 0)
# Run fsx for a while
for j in `seq 0 $((NUM_FILES-1))`; do
- run_check $here/ltp/fsx $FSX_OPTS -S ${seeds[$j]} -j $j $SCRATCH_MNT/testfile$j &
+ run_check $here/ltp/fsx $FSX_OPTS $FSX_AVOID -S ${seeds[$j]} -j $j $SCRATCH_MNT/testfile$j &
done
wait
diff --git a/tests/generic/457 b/tests/generic/457
index da75798f..ca0f5e62 100755
--- a/tests/generic/457
+++ b/tests/generic/457
@@ -83,7 +83,7 @@ FSX_OPTS="-N $NUM_OPS -d -k -P $SANITY_DIR -i $LOGWRITES_DMDEV"
for j in `seq 0 $((NUM_FILES-1))`; do
# clone the clone from prev iteration which may have already mutated
_cp_reflink $SCRATCH_MNT/testfile$((j-1)) $SCRATCH_MNT/testfile$j
- run_check $here/ltp/fsx $FSX_OPTS -S 0 -j $j $SCRATCH_MNT/testfile$j &
+ run_check $here/ltp/fsx $FSX_OPTS $FSX_AVOID -S 0 -j $j $SCRATCH_MNT/testfile$j &
done
wait