fstests: support check for uuidgen utility

A recent test uses the uuidgen utility to generate UUID-based
filenames, but this package is not necessarily installed as part of
the core packages of every distro.

As such, add the UUIDGEN_PROG environment variable to the common
configuration and update the test to require the existence of
uuidgen to run.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Brian Foster
2016-06-16 08:28:48 -04:00
committed by Eryu Guan
parent 5f02db6f02
commit 3ba258d97e
3 changed files with 5 additions and 2 deletions
+2 -1
View File
@@ -8,7 +8,8 @@ Building Linux:
For example, for Ubuntu: For example, for Ubuntu:
"sudo apt-get install xfslibs-dev uuid-dev libtool-bin e2fsprogs "sudo apt-get install xfslibs-dev uuid-dev libtool-bin e2fsprogs
automake gcc libuuid1 quota attr libattr1-dev make automake gcc libuuid1 quota attr libattr1-dev make
libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench" libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench
uuid-runtime"
- run make - run make
- run make install - run make install
- create fsgqa test user ("sudo useradd fsgqa") - create fsgqa test user ("sudo useradd fsgqa")
+1
View File
@@ -196,6 +196,7 @@ export RESTORE_PROG="`set_prog_path restore`"
export LVM_PROG="`set_prog_path lvm`" export LVM_PROG="`set_prog_path lvm`"
export CHATTR_PROG="`set_prog_path chattr`" export CHATTR_PROG="`set_prog_path chattr`"
export DEBUGFS_PROG="`set_prog_path debugfs`" export DEBUGFS_PROG="`set_prog_path debugfs`"
export UUIDGEN_PROG="`set_prog_path uuidgen`"
# use 'udevadm settle' or 'udevsettle' to wait for lv to be settled. # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
# newer systems have udevadm command but older systems like RHEL5 don't. # newer systems have udevadm command but older systems like RHEL5 don't.
+2 -1
View File
@@ -51,6 +51,7 @@ _supported_os Linux
_require_scratch_nocheck # check complains about single AG fs _require_scratch_nocheck # check complains about single AG fs
_require_xfs_io_command "fpunch" _require_xfs_io_command "fpunch"
_require_command $UUIDGEN_PROG uuidgen
rm -f $seqres.full rm -f $seqres.full
@@ -63,7 +64,7 @@ _scratch_mount
# sufficiently populates a 64k directory block. # sufficiently populates a 64k directory block.
mkdir $SCRATCH_MNT/src mkdir $SCRATCH_MNT/src
for i in $(seq 0 1023); do for i in $(seq 0 1023); do
touch $SCRATCH_MNT/src/`uuidgen` touch $SCRATCH_MNT/src/`$UUIDGEN_PROG`
done done
# precreate target dirs while we still have free space for inodes # precreate target dirs while we still have free space for inodes