X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fcommon.sh.in;h=29b85d3e10e21c990999c5e5e81c40c3aa0e377a;hb=cf91b2b6b2baaca1e56f23c985e3261cd98bd3f0;hp=3c1182016836558efb181f130c402d971bb2c745;hpb=6cb7ab069d9079a5b4b955da883d5ab804c91319;p=zfs.git

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 3c11820..29b85d3 100644
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -32,8 +32,7 @@ TESTS_SKIP=${TESTS_SKIP:-}
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libexecdir=@libexecdir@
-pkglibexecdir=${libexecdir}/@PACKAGE@
+pkgdatadir=@datarootdir@/@PACKAGE@
 bindir=@bindir@
 sbindir=@sbindir@
 udevdir=@udevdir@
@@ -41,24 +40,23 @@ udevruledir=@udevruledir@
 sysconfdir=@sysconfdir@
 
 ETCDIR=${ETCDIR:-/etc}
-DEVDIR=${DEVDIR:-/dev/disk/zpool}
-ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
-ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
-ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
+DEVDIR=${DEVDIR:-/dev/disk/by-vdev}
+ZPOOLDIR=${ZPOOLDIR:-${pkgdatadir}/zpool-config}
+ZPIOSDIR=${ZPIOSDIR:-${pkgdatadir}/zpios-test}
+ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkgdatadir}/zpios-profile}
 
 ZDB=${ZDB:-${sbindir}/zdb}
 ZFS=${ZFS:-${sbindir}/zfs}
 ZINJECT=${ZINJECT:-${sbindir}/zinject}
 ZPOOL=${ZPOOL:-${sbindir}/zpool}
-ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id}
 ZTEST=${ZTEST:-${sbindir}/ztest}
 ZPIOS=${ZPIOS:-${sbindir}/zpios}
 
-COMMON_SH=${COMMON_SH:-${pkglibexecdir}/common.sh}
-ZFS_SH=${ZFS_SH:-${pkglibexecdir}/zfs.sh}
-ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkglibexecdir}/zpool-create.sh}
-ZPIOS_SH=${ZPIOS_SH:-${pkglibexecdir}/zpios.sh}
-ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkglibexecdir}/zpios-survey.sh}
+COMMON_SH=${COMMON_SH:-${pkgdatadir}/common.sh}
+ZFS_SH=${ZFS_SH:-${pkgdatadir}/zfs.sh}
+ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkgdatadir}/zpool-create.sh}
+ZPIOS_SH=${ZPIOS_SH:-${pkgdatadir}/zpios.sh}
+ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkgdatadir}/zpios-survey.sh}
 
 LDMOD=${LDMOD:-/sbin/modprobe}
 LSMOD=${LSMOD:-/sbin/lsmod}
@@ -116,6 +114,27 @@ skip() {
 	echo -e "${COLOR_BROWN}Skip${COLOR_RESET}"
 }
 
+populate() {
+	local ROOT=$1
+	local MAX_DIR_SIZE=$2
+	local MAX_FILE_SIZE=$3
+
+	mkdir -p $ROOT/{a,b,c,d,e,f,g}/{h,i}
+	DIRS=`find $ROOT`
+
+	for DIR in $DIRS; do
+		COUNT=$(($RANDOM % $MAX_DIR_SIZE))
+
+		for i in `seq $COUNT`; do
+			FILE=`mktemp -p ${DIR}`
+			SIZE=$(($RANDOM % $MAX_FILE_SIZE))
+			dd if=/dev/urandom of=$FILE bs=1k count=$SIZE &>/dev/null
+		done
+	done
+
+	return 0
+}
+
 init() {
 	# Disable the udev rule 90-zfs.rules to prevent the zfs module
 	# stack from being loaded due to the detection of a zfs device.
@@ -124,9 +143,15 @@ init() {
 	# set to ensure the udev rule is correctly replaced on exit.
 	local RULE=${udevruledir}/90-zfs.rules
 	if test -e  ${RULE}; then
-		trap "mv ${RULE}.disabled ${RULE}; exit $?" INT TERM EXIT
+		trap "mv ${RULE}.disabled ${RULE}" INT TERM EXIT
 		mv ${RULE} ${RULE}.disabled
 	fi
+
+	# Create a random directory tree of files and sub-directories to
+	# to act as a copy source for the various regression tests.
+	SRC_DIR=`mktemp -d -p /var/tmp/ zfs.src.XXXXXXXX`
+	trap "rm -Rf $SRC_DIR" INT TERM EXIT
+	populate $SRC_DIR 10 100
 }
 
 spl_dump_log() {
@@ -344,7 +369,7 @@ format() {
 
 	# Force 4K blocksize, else mkfs.ext2 tries to use 8K, which
 	# won't mount
-	/sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} || return 1
+	/sbin/mkfs.${FSTYPE} -b 4096 -F -q ${DEVICE} >/dev/null || return 1
 
 	return 0
 }
@@ -498,7 +523,7 @@ udev_trigger() {
 
 #
 # The following udev helper functions assume that the provided
-# udev rules file will create a /dev/disk/zpool/<CHANNEL><RANK>
+# udev rules file will create a /dev/disk/by-vdev/<CHANNEL><RANK>
 # disk mapping.  In this mapping each CHANNEL is represented by
 # the letters a-z, and the RANK is represented by the numbers
 # 1-n.  A CHANNEL should identify a group of RANKS which are all