From 8db2dc32cdd50c5517851eab33bc31756e78975c Mon Sep 17 00:00:00 2001 From: Yuri Pankov Date: Sat, 19 Mar 2016 00:11:23 +0300 Subject: [PATCH] OpenZFS 6754 - zfs-tests: get_substr() function is redundant Authored by: Yuri Pankov Reviewed by: John Kennedy Approved by: Matthew Ahrens Reviewed-by: Brian Behlendorf Reviewed-by: Giuseppe Di Natale Ported-by: George Melikov OpenZFS-issue: https://www.illumos.org/issues/6754 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/01ff411 Closes #5787 Porting notes: - Only the ACL test cases used this function and they have been dropped from ZoL since Linux used POSIX style ACLs. - functional/acl/nontrivial/zfs_acl_chmod_aclmode_001_pos.ksh - functional/acl/nontrivial/zfs_acl_chmod_inherit_003_pos.ksh - functional/acl/nontrivial/zfs_acl_chmod_rwx_002_pos.ksh --- tests/zfs-tests/include/libtest.shlib | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 22b79b15a..da80407a9 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -23,10 +23,8 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# - -# # Copyright (c) 2012, 2015 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # . ${STF_TOOLS}/include/logapi.shlib @@ -2726,21 +2724,6 @@ function get_rootpool fi } -# -# Get the sub string from specified source string -# -# $1 source string -# $2 start position. Count from 1 -# $3 offset -# -function get_substr #src_str pos offset -{ - typeset pos offset - - $ECHO $1 | \ - $NAWK -v pos=$2 -v offset=$3 '{print substr($0, pos, offset)}' -} - # # Check if the given device is physical device # -- 2.40.0