diff options
| author | John Wren Kennedy <[email protected]> | 2018-01-31 13:20:18 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-08 21:29:17 -0800 |
| commit | 35e0202fd729a7a162d92b4939f1fe26cb31e454 (patch) | |
| tree | 9585a2d9e81e0d94aa5b0756b8b5521c1509d01d | |
| parent | f54976dc881549cc3222887188b110f2e8d05f0b (diff) | |
OpenZFS 8965 - zfs_acl_ls_001_pos fails due to no longer supported grep regex
The test used \> to detect the end of a string, but this no longer works,
so use $ which works as well since the string ends the line anyway.
Authored by: John Wren Kennedy <[email protected]>
Reviewed by: Akash Ayare <[email protected]>
Reviewed by: Pavel Zakharov <[email protected]>
Reviewed by: Yuri Pankov <[email protected]>
Reviewed by: Igor Kozhukhov <[email protected]>
Reviewed by: Brian Behlendorf <[email protected]>
Approved by: Dan McDonald <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/8965
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/cb1204e444
Closes #7145
| -rw-r--r-- | tests/zfs-tests/tests/functional/acl/acl_common.kshlib | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/zfs-tests/tests/functional/acl/acl_common.kshlib b/tests/zfs-tests/tests/functional/acl/acl_common.kshlib index 75bb82455..0fe6d2b6a 100644 --- a/tests/zfs-tests/tests/functional/acl/acl_common.kshlib +++ b/tests/zfs-tests/tests/functional/acl/acl_common.kshlib @@ -25,7 +25,7 @@ # # -# Copyright (c) 2016 by Delphix. All rights reserved. +# Copyright (c) 2016, 2018 by Delphix. All rights reserved. # . $STF_SUITE/tests/functional/acl/acl.cfg @@ -185,7 +185,7 @@ function plus_sign_check_l #<obj> return 1 fi - ls -ld $obj | awk '{print $1}' | grep "+\>" > /dev/null + ls -ld $obj | awk '{print $1}' | grep "+$" > /dev/null return $? } @@ -202,7 +202,7 @@ function plus_sign_check_v #<obj> return 1 fi - ls -vd $obj | nawk '(NR == 1) {print $1}' | grep "+\>" > /dev/null + ls -vd $obj | awk '(NR == 1) {print $1}' | grep "+$" > /dev/null return $? } |