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/snapshot/snapshot_004_pos.ksh
+++ new/usr/src/test/zfs-tests/tests/functional/snapshot/snapshot_004_pos.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
17 17 # fields enclosed by brackets "[]" replaced with your own identifying
18 18 # information: Portions Copyright [yyyy] [name of copyright owner]
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
19 19 #
20 20 # CDDL HEADER END
21 21 #
22 22
23 23 #
24 24 # Copyright 2007 Sun Microsystems, Inc. All rights reserved.
25 25 # Use is subject to license terms.
26 26 #
27 27
28 28 #
29 -# Copyright (c) 2013 by Delphix. All rights reserved.
29 +# Copyright (c) 2013, 2016 by Delphix. All rights reserved.
30 30 #
31 31
32 32 . $STF_SUITE/include/libtest.shlib
33 33 . $STF_SUITE/tests/functional/snapshot/snapshot.cfg
34 34
35 35 #
36 36 # DESCRIPTION:
37 37 # Create a null snapshot i.e. a snapshot created before file system
38 38 # activity is empty.
39 39 #
40 40 # STRATEGY:
41 41 # 1. Empty a file system
42 42 # 2. Take a snapshot of the empty file system.
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
43 43 # 3. Populate the file system
44 44 # 4. Verify the snapshot is still empty
45 45 #
46 46
47 47 verify_runnable "both"
48 48
49 49 function cleanup
50 50 {
51 51 snapexists $SNAPFS
52 52 [[ $? -eq 0 ]] && \
53 - log_must $ZFS destroy $SNAPFS
53 + log_must zfs destroy $SNAPFS
54 54
55 55 [[ -e $TESTDIR ]] && \
56 - log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
56 + log_must rm -rf $TESTDIR/* > /dev/null 2>&1
57 57 }
58 58
59 59 log_assert "Verify that a snapshot of an empty file system remains empty."
60 60
61 61 log_onexit cleanup
62 62
63 63 [[ -n $TESTDIR ]] && \
64 - log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
64 + log_must rm -rf $TESTDIR/* > /dev/null 2>&1
65 65
66 -log_must $ZFS snapshot $SNAPFS
67 -FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total 0" | wc -l`
66 +log_must zfs snapshot $SNAPFS
67 +FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total 0" | wc -l`
68 68 if [[ $FILE_COUNT -ne 0 ]]; then
69 - $LS $SNAPDIR
69 + ls $SNAPDIR
70 70 log_fail "BEFORE: $SNAPDIR contains $FILE_COUNT files(s)."
71 71 fi
72 72
73 73 typeset -i COUNT=10
74 74
75 75 log_note "Populate the $TESTDIR directory"
76 76 typeset -i i=1
77 77 while [[ $i -lt $COUNT ]]; do
78 - log_must $FILE_WRITE -o create -f $TESTDIR/file$i \
78 + log_must file_write -o create -f $TESTDIR/file$i \
79 79 -b $BLOCKSZ -c $NUM_WRITES -d $i
80 80
81 81 (( i = i + 1 ))
82 82 done
83 83
84 -FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total 0" | wc -l`
84 +FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total 0" | wc -l`
85 85 if [[ $FILE_COUNT -ne 0 ]]; then
86 - $LS $SNAPDIR
86 + ls $SNAPDIR
87 87 log_fail "AFTER: $SNAPDIR contains $FILE_COUNT files(s)."
88 88 fi
89 89
90 90 log_pass "The NULL snapshot remains empty."
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX