From 2816c4ace7a4e702d9e9cc94b60b4ae41a052fe1 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Wed, 31 Jan 2018 13:20:18 -0700 Subject: [PATCH] 8965 zfs_acl_ls_001_pos fails due to no longer supported grep regex Reviewed by: Akash Ayare Reviewed by: Pavel Zakharov Reviewed by: Yuri Pankov Reviewed by: Igor Kozhukhov Approved by: Dan McDonald --- usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib b/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib index f6b1e80cbe..a67f1b0683 100644 --- a/usr/src/test/zfs-tests/tests/functional/acl/acl_common.kshlib +++ b/usr/src/test/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 # 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 # 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 $? } -- 2.11.4.GIT