mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Ensure QA tests are run with all the mount options requested
This commit is contained in:
@@ -78,7 +78,7 @@ _test_mount()
|
|||||||
TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV"
|
TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV"
|
||||||
[ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \
|
[ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \
|
||||||
TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV"
|
TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV"
|
||||||
mount -t xfs $TEST_OPTIONS $* $TEST_DEV $TEST_DIR
|
mount -t xfs $TEST_OPTIONS $MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
|
||||||
}
|
}
|
||||||
|
|
||||||
_scratch_mount_options()
|
_scratch_mount_options()
|
||||||
@@ -88,7 +88,7 @@ _scratch_mount_options()
|
|||||||
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
|
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
|
||||||
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
|
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
|
||||||
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
|
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
|
||||||
echo $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
|
echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
|
||||||
}
|
}
|
||||||
|
|
||||||
_scratch_mount()
|
_scratch_mount()
|
||||||
@@ -98,7 +98,7 @@ _scratch_mount()
|
|||||||
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
|
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
|
||||||
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
|
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
|
||||||
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
|
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
|
||||||
mount -t xfs $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
|
mount -t xfs $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
|
||||||
}
|
}
|
||||||
|
|
||||||
_scratch_mkfs_options()
|
_scratch_mkfs_options()
|
||||||
|
|||||||
Reference in New Issue
Block a user