summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Crawford <[email protected]>2017-01-31 17:47:32 -0500
committerBrian Behlendorf <[email protected]>2017-01-31 14:47:32 -0800
commit544b8053dbb03de69950c232d1f1970bc36535b6 (patch)
tree9640893b43ae6e43949f990b3f1c56a1e17b8a5e
parent539d33c791da2f970cfa5a1bddf0533b23146265 (diff)
Match on word for excluding pools from tests
Running tests locally were failing on cleanup scripts due to having a pool named "pool". Match on word so the cleanup logic will cleanup "testpool.*" while ignoring "pool". Reviewed-by: loli10K <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Tim Crawford <[email protected]> Closes #5703
-rw-r--r--tests/zfs-tests/include/libtest.shlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index 199a93503..b5f8b1291 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -450,7 +450,7 @@ function default_cleanup_noexit
[[ -z "$KEEP" ]] && KEEP="rpool"
exclude=`eval $ECHO \"'(${KEEP})'\"`
ALL_POOLS=$($ZPOOL list -H -o name \
- | $GREP -v "$NO_POOLS" | $EGREP -v "$exclude")
+ | $GREP -v "$NO_POOLS" | $EGREP -vw "$exclude")
# Here, we loop through the pools we're allowed to
# destroy, only destroying them if it's safe to do
# so.