Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh
+++ new/usr/src/test/zfs-tests/tests/functional/xattr/cleanup.ksh
1 1 #!/bin/ksh -p
2 2 #
3 3 # CDDL HEADER START
4 4 #
5 5 # The contents of this file are subject to the terms of the
6 6 # Common Development and Distribution License (the "License").
7 7 # You may not use this file except in compliance with the License.
8 8 #
9 9 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 # or http://www.opensolaris.org/os/licensing.
11 11 # See the License for the specific language governing permissions
12 12 # and limitations under the License.
13 13 #
14 14 # When distributing Covered Code, include this CDDL HEADER in each
15 15 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 # If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
17 17 # fields enclosed by brackets "[]" replaced with your own identifying
18 18 # information: Portions Copyright [yyyy] [name of copyright owner]
19 19 #
20 20 # CDDL HEADER END
21 21 #
22 22 # Copyright 2007 Sun Microsystems, Inc. All rights reserved.
23 23 # Use is subject to license terms.
24 24 #
25 25
26 26 #
27 -# Copyright (c) 2013 by Delphix. All rights reserved.
27 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
28 28 #
29 29
30 30 . $STF_SUITE/include/libtest.shlib
31 31
32 -ZFS_USER=$($CAT /tmp/zfs-xattr-test-user.txt)
33 -$RM /tmp/zfs-xattr-test-user.txt
32 +ZFS_USER=$(cat /tmp/zfs-xattr-test-user.txt)
33 +rm /tmp/zfs-xattr-test-user.txt
34 34
35 -USES_NIS=$($CAT /tmp/zfs-xattr-test-nis.txt)
36 -$RM /tmp/zfs-xattr-test-nis.txt
35 +USES_NIS=$(cat /tmp/zfs-xattr-test-nis.txt)
36 +rm /tmp/zfs-xattr-test-nis.txt
37 37
38 38 del_user $ZFS_USER
39 39
40 40 if [ "${USES_NIS}" == "true" ]
41 41 then
42 - $SVCADM enable svc:/network/nis/client:default
42 + svcadm enable svc:/network/nis/client:default
43 43 fi
44 44
45 45 default_cleanup
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX