c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 02:14:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 8965 - zfs_acl_ls_001_pos fails due to no longer supported grep regex

Browse Source 
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 <john.kennedy@delphix.com>
Reviewed by: Akash Ayare <aayare@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: Yuri Pankov <yuripv@icloud.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Dan McDonald <danmcd@joyent.com>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

OpenZFS-issue: https://www.illumos.org/issues/8965
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/cb1204e444
Closes #7145
This commit is contained in:
John Wren Kennedy 2018-01-31 13:20:18 -07:00 committed by Brian Behlendorf
parent f54976dc88
commit 35e0202fd7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/zfs-tests/tests/functional/acl/acl_common.kshlib
View File

@ -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 $?
}