From 35e0202fd729a7a162d92b4939f1fe26cb31e454 Mon Sep 17 00:00:00 2001
From: John Wren Kennedy <john.kennedy@delphix.com>
Date: Wed, 31 Jan 2018 13:20:18 -0700
Subject: [PATCH] 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 <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
---
 tests/zfs-tests/tests/functional/acl/acl_common.kshlib | 6 +++---
 1 file 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 75bb824559c0..0fe6d2b6a69e 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 $?
 }