X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fcommon.sh.in;h=57508be9fe73a90f3233991ee714ecd48a43d99c;hb=2959d94a0a53612cc1ca9ce9d17df26c3d69a513;hp=00418696c8e46cbe67c0348bdaced901ace976f8;hpb=c9c0d073da561bcbefbdf09c87fc75b227415619;p=zfs.git

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 0041869..57508be 100644
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -1,13 +1,13 @@
 #!/bin/bash
 #
-# Common support functions for testing scripts.  If a .script-config
+# Common support functions for testing scripts.  If a script-config
 # files is available it will be sourced so in-tree kernel modules and
-# utilities will be used.  If no .script-config can be found then the
+# utilities will be used.  If no script-config can be found then the
 # installed kernel modules and utilities will be used.
 
 basedir="$(dirname $0)"
 
-SCRIPT_CONFIG=.script-config
+SCRIPT_CONFIG=zfs-script-config.sh
 if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
 . "${basedir}/../${SCRIPT_CONFIG}"
 else
@@ -26,6 +26,8 @@ RAID0S=()
 RAID10S=()
 RAIDZS=()
 RAIDZ2S=()
+TESTS_RUN=${TESTS_RUN:-'*'}
+TESTS_SKIP=${TESTS_SKIP:-}
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -37,6 +39,8 @@ sbindir=@sbindir@
 ETCDIR=${ETCDIR:-/etc}
 DEVDIR=${DEVDIR:-/dev/disk/zpool}
 ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
+ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test}
+ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile}
 
 ZDB=${ZDB:-${sbindir}/zdb}
 ZFS=${ZFS:-${sbindir}/zfs}
@@ -44,10 +48,13 @@ 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}
 
 LDMOD=${LDMOD:-/sbin/modprobe}
 LSMOD=${LSMOD:-/sbin/lsmod}
@@ -58,6 +65,24 @@ SYSCTL=${SYSCTL:-/sbin/sysctl}
 UDEVADM=${UDEVADM:-/sbin/udevadm}
 AWK=${AWK:-/usr/bin/awk}
 
+COLOR_BLACK="\033[0;30m"
+COLOR_DK_GRAY="\033[1;30m"
+COLOR_BLUE="\033[0;34m"
+COLOR_LT_BLUE="\033[1;34m" 
+COLOR_GREEN="\033[0;32m"
+COLOR_LT_GREEN="\033[1;32m"
+COLOR_CYAN="\033[0;36m"
+COLOR_LT_CYAN="\033[1;36m"
+COLOR_RED="\033[0;31m"
+COLOR_LT_RED="\033[1;31m"
+COLOR_PURPLE="\033[0;35m"
+COLOR_LT_PURPLE="\033[1;35m"
+COLOR_BROWN="\033[0;33m"
+COLOR_YELLOW="\033[1;33m"
+COLOR_LT_GRAY="\033[0;37m"
+COLOR_WHITE="\033[1;37m"
+COLOR_RESET="\033[0m"
+
 die() {
 	echo -e "${PROG}: $1" >&2
 	exit 1
@@ -70,14 +95,18 @@ msg() {
 }
 
 pass() {
-	echo "PASS"
+	echo -e "${COLOR_GREEN}Pass${COLOR_RESET}"
 }
 
 fail() {
-	echo "FAIL ($1)"
+	echo -e "${COLOR_RED}Fail${COLOR_RESET} ($1)"
 	exit $1
 }
 
+skip() {
+	echo -e "${COLOR_BROWN}Skip${COLOR_RESET}"
+}
+
 spl_dump_log() {
 	${SYSCTL} -w kernel.spl.debug.dump=1 &>/dev/null
 	local NAME=`dmesg | tail -n 1 | cut -f5 -d' '`
@@ -371,3 +400,61 @@ udev_raidz2_setup() {
 
 	return 0
 }
+
+run_one_test() {
+	local TEST_NUM=$1
+	local TEST_NAME=$2
+
+	printf "%-4d %-36s " ${TEST_NUM} "${TEST_NAME}"
+	test_${TEST_NUM}
+}
+
+skip_one_test() {
+	local TEST_NUM=$1
+	local TEST_NAME=$2
+
+	printf "%-4d %-36s " ${TEST_NUM} "${TEST_NAME}"
+	skip
+}
+
+run_test() {
+	local TEST_NUM=$1
+	local TEST_NAME=$2
+
+	for i in ${TESTS_SKIP[@]}; do
+		if [[ $i == ${TEST_NUM} ]] ; then
+			skip_one_test ${TEST_NUM} "${TEST_NAME}"
+			return 0
+		fi
+	done
+
+	if [ "${TESTS_RUN[0]}" = "*" ]; then
+		run_one_test ${TEST_NUM} "${TEST_NAME}"
+	else
+		for i in ${TESTS_RUN[@]}; do
+			if [[ $i == ${TEST_NUM} ]] ; then
+				run_one_test ${TEST_NUM} "${TEST_NAME}"
+				return 0
+			fi
+		done
+
+		skip_one_test ${TEST_NUM} "${TEST_NAME}"
+	fi
+}
+
+wait_udev() {
+	local DEVICE=$1
+	local DELAY=$2
+	local COUNT=0
+
+	while [ ! -e ${DEVICE} ]; do
+		if [ ${COUNT} -gt ${DELAY} ]; then
+			return 1
+		fi
+
+		let COUNT=${COUNT}+1
+	        sleep 1
+	done
+
+	return 0
+}