Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes for single test runs in zfs-tests #5844

Merged
merged 1 commit into from
Mar 1, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/zfs-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ find_runfile() {
usage() {
cat << EOF
USAGE:
$0 [hvqxkf] [-s SIZE] [-r RUNFILE]
$0 [hvqxkf] [-s SIZE] [-r RUNFILE] [-t PATH] [-u USER]

DESCRIPTION:
ZFS Test Suite launch script
Expand All @@ -169,7 +169,7 @@ OPTIONS:
-d DIR Use DIR for files and loopback devices
-s SIZE Use vdevs of SIZE (default: 4G)
-r RUNFILE Run tests in RUNFILE (default: linux.run)
-t PATH Run single test at PATH
-t PATH Run single test at PATH relative to test suite
-u USER Run single test as USER (default: root)

EXAMPLES:
Expand Down Expand Up @@ -264,11 +264,11 @@ EOF
SETUPSCRIPT=
CLEANUPSCRIPT=

if [ -f "$SINGLETESTDIR/setup.ksh" ]; then
if [ -f "$STF_SUITE/$SINGLETESTDIR/setup.ksh" ]; then
SETUPSCRIPT="setup"
fi

if [ -f "$SINGLETESTDIR/cleanup.ksh" ]; then
if [ -f "$STF_SUITE/$SINGLETESTDIR/cleanup.ksh" ]; then
CLEANUPSCRIPT="cleanup"
fi

Expand Down Expand Up @@ -409,7 +409,7 @@ RESULT=$?
echo

if [ ${#SINGLETEST[@]} -ne 0 ]; then
rm -f "$RUNFILEDIR/$RUNFILE" &>/dev/null
rm -f "$RUNFILE" &>/dev/null
fi

exit ${RESULT}