From 3ba258d97e7b34e160494fafedb9b2a632582458 Mon Sep 17 00:00:00 2001 From: Brian Foster Date: Thu, 16 Jun 2016 08:28:48 -0400 Subject: [PATCH] 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- README | 3 ++- common/config | 1 + tests/xfs/306 | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README b/README index 3800df76..2647e127 100644 --- a/README +++ b/README @@ -8,7 +8,8 @@ Building Linux: For example, for Ubuntu: "sudo apt-get install xfslibs-dev uuid-dev libtool-bin e2fsprogs 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 install - create fsgqa test user ("sudo useradd fsgqa") diff --git a/common/config b/common/config index c25b1ece..713f7c7e 100644 --- a/common/config +++ b/common/config @@ -196,6 +196,7 @@ export RESTORE_PROG="`set_prog_path restore`" export LVM_PROG="`set_prog_path lvm`" export CHATTR_PROG="`set_prog_path chattr`" 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. # newer systems have udevadm command but older systems like RHEL5 don't. diff --git a/tests/xfs/306 b/tests/xfs/306 index eb51e410..b3730794 100755 --- a/tests/xfs/306 +++ b/tests/xfs/306 @@ -51,6 +51,7 @@ _supported_os Linux _require_scratch_nocheck # check complains about single AG fs _require_xfs_io_command "fpunch" +_require_command $UUIDGEN_PROG uuidgen rm -f $seqres.full @@ -63,7 +64,7 @@ _scratch_mount # sufficiently populates a 64k directory block. mkdir $SCRATCH_MNT/src for i in $(seq 0 1023); do - touch $SCRATCH_MNT/src/`uuidgen` + touch $SCRATCH_MNT/src/`$UUIDGEN_PROG` done # precreate target dirs while we still have free space for inodes -- 2.39.5