From c8f9061fc714696a53cf4d14a4567f0a83dbf862 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 15 Aug 2017 17:26:38 -0700 Subject: Retire legacy test infrastructure * Removed zpios kmod, utility, headers and man page. * Removed unused scripts zpios-profile/*, zpios-test/*, zpool-config/*, smb.sh, zpios-sanity.sh, zpios-survey.sh, zpios.sh, and zpool-create.sh. * Removed zfs-script-config.sh.in. When building 'make' generates a common.sh with in-tree path information from the common.sh.in template. This file and sourced by the test scripts and used for in-tree testing, it is not included in the packages. When building packages 'make install' uses the same template to create a new common.sh which is appropriate for the packaging. * Removed unused functions/variables from scripts/common.sh.in. Only minimal path information and configuration environment variables remain. * Removed unused scripts from scripts/ directory. * Remaining shell scripts in the scripts directory updated to cleanly pass shellcheck and added to checked scripts. * Renamed tests/test-runner/cmd/ to tests/test-runner/bin/ to match install location name. * Removed last traces of the --enable-debug-dmu-tx configure options which was retired some time ago. Reviewed-by: Giuseppe Di Natale Signed-off-by: Brian Behlendorf Closes #6509 --- scripts/zloop.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/zloop.sh') diff --git a/scripts/zloop.sh b/scripts/zloop.sh index 3a6db40cf..d3ec93202 100755 --- a/scripts/zloop.sh +++ b/scripts/zloop.sh @@ -20,11 +20,10 @@ # Copyright (C) 2016 Lawrence Livermore National Security, LLC. # -basedir=$(dirname "$0") - +BASE_DIR=$(dirname "$0") SCRIPT_COMMON=common.sh -if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then - . "${basedir}/${SCRIPT_COMMON}" +if [ -f "${BASE_DIR}/${SCRIPT_COMMON}" ]; then + . "${BASE_DIR}/${SCRIPT_COMMON}" else echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 fi -- cgit v1.2.3