@@ -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"
@@ -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"
@@ -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"
@@ -44,6 +44,7 @@ _cleanup()
# real QA test starts here
_supported_os Linux
_require_scratch
+_require_populate_commands
_require_test_program "attr-list-by-handle-cursor-test"
rm -f "$seqres.full"
@@ -44,6 +44,7 @@ _cleanup()
_supported_os Linux
_supported_fs xfs
_require_scratch
+_require_populate_commands
_require_xfs_io_command "fsmap"
rm -f "$seqres.full"
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> --- common/populate | 9 ++++++--- tests/ext4/006 | 1 + tests/xfs/083 | 3 +-- tests/xfs/085 | 1 + tests/xfs/086 | 1 + tests/xfs/087 | 1 + tests/xfs/088 | 1 + tests/xfs/089 | 1 + tests/xfs/091 | 1 + tests/xfs/093 | 1 + tests/xfs/097 | 1 + tests/xfs/098 | 1 + tests/xfs/099 | 1 + tests/xfs/100 | 1 + tests/xfs/101 | 1 + tests/xfs/102 | 1 + tests/xfs/105 | 1 + tests/xfs/112 | 1 + tests/xfs/113 | 1 + tests/xfs/117 | 1 + tests/xfs/120 | 1 + tests/xfs/123 | 1 + tests/xfs/124 | 1 + tests/xfs/125 | 1 + tests/xfs/126 | 1 + tests/xfs/269 | 1 + tests/xfs/273 | 1 + 27 files changed, 32 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html