diff options
| author | Giuseppe Di Natale <[email protected]> | 2017-02-03 13:24:44 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-03 13:24:44 -0800 |
| commit | d21d5b8248cf38d1518c9beccc350bc9081ff6be (patch) | |
| tree | 0049ce696ca24c5c10051b7186d9f205153cf4fd /scripts | |
| parent | 9b7b9cd370ed2ec4c8ee346bcb95cb30ba7e9ba9 (diff) | |
OpenZFS 4521 - zfstest is trying to execute evil "zfs unmount -a"
Authored by: Yuri Pankov <[email protected]>
Reviewed by: Andriy Gapon <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: John Kennedy <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
Porting Notes:
- Correctly set __ZFS_POOL_RESTRICT in inherit_001_pos
OpenZFS-issue: https://www.illumos.org/issues/4521
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/8808ac5
Closes #5674
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/zfs-tests.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh index 01fb2b289..2e27c0a1c 100755 --- a/scripts/zfs-tests.sh +++ b/scripts/zfs-tests.sh @@ -279,6 +279,8 @@ if [ -z "${KEEP}" ]; then fi fi +__ZFS_POOL_EXCLUDE="$(echo $KEEP | sed ':a;N;s/\n/ /g;ba')" + msg msg "--- Configuration ---" msg "Runfile: $RUNFILE" @@ -341,6 +343,7 @@ export STF_TOOLS export STF_SUITE export DISKS export KEEP +export __ZFS_POOL_EXCLUDE msg "${TEST_RUNNER} ${QUIET} -c ${RUNFILE} -i ${STF_SUITE}" ${TEST_RUNNER} ${QUIET} -c ${RUNFILE} -i ${STF_SUITE} |