mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
populate: add _require_populate_commands to check for tools
Back when I created common/populate, I thought it was sufficient to _require the tools that the populate functions need in the main file. This turned out to be a bit sloppy, so move them into a helper function and call it from everything that uses populate. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Eryu Guan <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
committed by
Eryu Guan
parent
7d8fc2aff3
commit
8eaf59b7c3
+6
-3
@@ -22,9 +22,12 @@
|
||||
# Mountain View, CA 94043, USA, or: http://www.sgi.com
|
||||
#-----------------------------------------------------------------------
|
||||
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_test_program "punch-alternating"
|
||||
_require_populate_commands() {
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_test_program "punch-alternating"
|
||||
_require_command "$XFS_DB_PROG" "xfs_db"
|
||||
}
|
||||
|
||||
_require_xfs_db_blocktrash_z_command() {
|
||||
test "${FSTYP}" = "xfs" || _notrun "cannot run xfs_db on ${FSTYP}"
|
||||
|
||||
@@ -54,6 +54,7 @@ _supported_os Linux
|
||||
|
||||
_require_scratch
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
|
||||
repair_scratch() {
|
||||
fsck_pass="$1"
|
||||
|
||||
+1
-2
@@ -48,12 +48,11 @@ _cleanup()
|
||||
_supported_fs xfs
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_scratch
|
||||
#_require_xfs_crc # checksum not required, but you probably want it anyway...
|
||||
#_require_xfs_mkfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
|
||||
scratch_repair() {
|
||||
fsck_pass="$1"
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ _require_xfs_mkfs_finobt
|
||||
_require_xfs_finobt
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ _supported_os Linux
|
||||
_require_scratch
|
||||
test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
|
||||
_require_attrs
|
||||
_require_populate_commands
|
||||
_require_xfs_db_blocktrash_z_command
|
||||
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user