Date: Wed, 23 Aug 2017 20:28:25 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322822 - in projects/zfsd/head/tests/sys/cddl/zfs: bin include tests/bootfs tests/cache tests/cachefile tests/cli_root/zfs_copies tests/cli_root/zfs_get tests/cli_root/zfs_mount tests/... Message-ID: <201708232028.v7NKSPkv077763@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Aug 23 20:28:25 2017 New Revision: 322822 URL: https://svnweb.freebsd.org/changeset/base/322822 Log: Remove the ZFS test suite's dependency on sysutils/mkfile mkfile is so small (7.6KB) that it makes more sense to import its source directly than to manage it through ports. tests/sys/cddl/zfs/bin/Makefile tests/sys/cddl/zfs/bin/mkfile.c tests/sys/cddl/zfs/include/commands.txt Import mkfile, add it to the build, and make it available to the ZFS test suite. tests/sys/cddl/zfs/tests/**/*_test.sh Remove the "require.progs" check for mkfile tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_005_pos.ksh tests/sys/cddl/zfs/tests/hotplug/setup.ksh tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian_001_pos.ksh tests/sys/cddl/zfs/tests/remote/cross_endian/setup.ksh tests/sys/cddl/zfs/tests/rsend/rsend_009_pos.ksh tests/sys/cddl/zfs/tests/userquota/groupspace_002_pos.ksh tests/sys/cddl/zfs/tests/userquota/userquota_001_pos.ksh tests/sys/cddl/zfs/tests/userquota/userquota_004_pos.ksh Use truncate instead of mkfile to create file-backed vdevs. Truncate is faster because it creates sparse files. MFC after: 3 weeks Obtained from: http://www.infolab.ne.jp/~hatanou/freebsd/mkfile Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c (contents, props changed) Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/cross_endian_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/cross_endian/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_009_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/groupspace_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/xattr/xattr_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile Wed Aug 23 20:28:25 2017 (r322822) @@ -44,6 +44,7 @@ PROGS+= file_check PROGS+= file_trunc PROGS+= file_write PROGS+= largest_file +PROGS+= mkfile PROGS+= mktree PROGS+= mmapwrite PROGS+= randfree_file Added: projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/bin/mkfile.c Wed Aug 23 20:28:25 2017 (r322822) @@ -0,0 +1,213 @@ +/*- + * Copyright (c) 2001-2013 + * HATANO Tomomi. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef lint +static char rcsid[] = "$Id: mkfile.c,v 1.5 2013-10-26 10:11:34+09 hatanou Exp $"; +#endif /* !lint */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <fcntl.h> +#include <limits.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/uio.h> +#include <unistd.h> +#include <ctype.h> +#include <errno.h> + +#define MKFILE_WBUF ((size_t)(1048576)) /* Is 1M a reasonable value? */ + +/* SunOS's mkfile(8) sets "sticky bit." */ +#define MKFILE_FLAG (O_WRONLY | O_CREAT | O_TRUNC) +#define MKFILE_MODE (S_IRUSR | S_IWUSR | S_ISVTX) + +static char buf[MKFILE_WBUF]; +static int nofill = 0; +static int verbose = 0; + +static void +usage() +{ + fprintf(stderr, + "Usage: mkfile [-nv] <size>[e|p|t|g|m|k|b] <filename> ...\n"); +} + +static unsigned long long +getsize(char *s) +{ + int sh; + unsigned long long length; + char *suffix; + + /* + * NOTE: We don't handle 'Z' (zetta) or 'Y' (yotta) suffixes yet. + * These are too large to store in unsigned long long (64bits). + * In the future, we'll have to use larger type, + * something like uint128_t. + */ + length = strtoull(s, &suffix, 10); + sh = 0; + switch (tolower(*suffix)) { + case 'e': /* Exabytes. */ + sh = 60; + break; + case 'p': /* Petabytes. */ + sh = 50; + break; + case 't': /* Terabytes. */ + sh = 40; + break; + case 'g': /* Gigabytes. */ + sh = 30; + break; + case 'm': /* Megabytes. */ + sh = 20; + break; + case 'k': /* Kilobytes. */ + sh = 10; + break; + case 'b': /* Blocks. */ + sh = 9; + break; + case '\0': /* Bytes. */ + break; + default: /* Unknown... */ + errno = EINVAL; + return 0; + } + if (sh) { + unsigned long long l; + + l = length; + length <<= sh; + /* Check overflow. */ + if ((length >> sh) != l) { + errno = ERANGE; + return 0; + } + } + + return length; +} + +static int +create_file(char *f, unsigned long long s) +{ + int fd; + size_t w; + ssize_t ws; + + if (verbose) { + fprintf(stdout, "%s %llu bytes\n", f, s); + fflush(stdout); + } + + /* Open file to create. */ + if ((fd = open(f, MKFILE_FLAG, MKFILE_MODE)) < 0) { + return -1; + } + + /* Seek to the end and write 1 byte. */ + if ((lseek(fd, (off_t)(s - 1LL), SEEK_SET) == (off_t)-1) || + (write(fd, buf, (size_t)1) == (ssize_t)-1)) { + /* + * We don't close(fd) here to avoid overwriting errno. + * This is fd-leak, but is not harmful + * because returning error causes mkfile(8) to exit. + */ + return -1; + } + + /* Fill. */ + if (!nofill) { + if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) { + /* Same as above. */ + return -1; + } + while (s) { + w = (s > MKFILE_WBUF) ? MKFILE_WBUF : s; + if ((ws = write(fd, buf, w)) == (ssize_t)-1) { + /* Same as above. */ + return -1; + } + s -= ws; + } + } + close(fd); + + return 0; +} + +int +main(int argc, char *argv[]) +{ + unsigned long long fsize; + char ch; + + /* We have at least 2 arguments. */ + if (argc < 3) { + usage(); + return EXIT_FAILURE; + } + + /* Options. */ + while ((ch = getopt(argc, argv, "nv")) != -1) { + switch (ch) { + case 'n': + nofill = 1; + break; + case 'v': + verbose = 1; + break; + default: + usage(); + return EXIT_FAILURE; + } + } + argc -= optind; + argv += optind; + + /* File size to create. */ + if ((fsize = getsize(*argv)) == 0) { + perror(*argv); + return EXIT_FAILURE; + } + + /* Filenames to create. */ + bzero(buf, MKFILE_WBUF); + while (++argv, --argc) { + if (create_file(*argv, fsize) == -1) { + perror(*argv); + unlink(*argv); + return EXIT_FAILURE; + } + } + + return EXIT_SUCCESS; +} Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Wed Aug 23 20:28:25 2017 (r322822) @@ -108,7 +108,6 @@ #/usr/sbin/metainit #/usr/sbin/metastat /bin/mkdir -/usr/local/sbin/mkfile /sbin/mknod #/usr/sbin/modinfo #/usr/sbin/modunload @@ -154,6 +153,7 @@ /usr/bin/touch /usr/bin/tr /usr/bin/true +/usr/bin/truncate /sbin/tunefs #/usr/sbin/ufsdump #/usr/sbin/ufsrestore Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/constants.cfg Wed Aug 23 20:28:25 2017 (r322822) @@ -22,6 +22,7 @@ export FILE_WRITE="file_write" export FILE_CHECK="file_check" export LARGEST_FILE="largest_file" export MMAPWRITE="mmapwrite" +export MKFILE="mkfile" export READMMAP="readmmap" export FILE_TRUNC="file_trunc" export CHG_USR_EXEC="chg_usr_exec" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -28,7 +28,7 @@ atf_test_case bootfs_001_pos bootfs_001_pos_head() { atf_set "descr" "Valid datasets are accepted as bootfs property values" - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs } bootfs_001_pos_body() { @@ -60,7 +60,7 @@ atf_test_case bootfs_003_pos bootfs_003_pos_head() { atf_set "descr" "Valid pool names are accepted by zpool set bootfs" - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs } bootfs_003_pos_body() { @@ -76,7 +76,7 @@ atf_test_case bootfs_004_neg bootfs_004_neg_head() { atf_set "descr" "Invalid pool names are rejected by zpool set bootfs" - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs } bootfs_004_neg_body() { @@ -108,7 +108,7 @@ atf_test_case bootfs_006_pos bootfs_006_pos_head() { atf_set "descr" "Pools of correct vdev types accept boot property" - atf_set "require.progs" zfs zpool mkfile + atf_set "require.progs" zfs zpool } bootfs_006_pos_body() { @@ -140,7 +140,7 @@ atf_test_case bootfs_008_neg bootfs_008_neg_head() { atf_set "descr" "setting bootfs on a dataset which has gzip compression enabled will fail" - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs } bootfs_008_neg_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -28,7 +28,7 @@ atf_test_case cache_001_pos cleanup cache_001_pos_head() { atf_set "descr" "Creating a pool with a cache device succeeds." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_001_pos_body() @@ -56,7 +56,7 @@ atf_test_case cache_002_pos cleanup cache_002_pos_head() { atf_set "descr" "Adding a cache device to normal pool works." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_002_pos_body() @@ -84,7 +84,7 @@ atf_test_case cache_003_pos cleanup cache_003_pos_head() { atf_set "descr" "Adding an extra cache device works." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_003_pos_body() @@ -112,7 +112,7 @@ atf_test_case cache_004_neg cleanup cache_004_neg_head() { atf_set "descr" "Attaching a cache device fails." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_004_neg_body() @@ -140,7 +140,7 @@ atf_test_case cache_005_neg cleanup cache_005_neg_head() { atf_set "descr" "Replacing a cache device fails." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_005_neg_body() @@ -168,7 +168,7 @@ atf_test_case cache_006_pos cleanup cache_006_pos_head() { atf_set "descr" "Exporting and importing pool with cache devices passes." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_006_pos_body() @@ -196,7 +196,7 @@ atf_test_case cache_007_neg cleanup cache_007_neg_head() { atf_set "descr" "A mirror/raidz/raidz2 cache is not supported." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_007_neg_body() @@ -224,7 +224,7 @@ atf_test_case cache_008_neg cleanup cache_008_neg_head() { atf_set "descr" "A raidz/raidz2 cache can not be added to existed pool." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_008_neg_body() @@ -252,7 +252,7 @@ atf_test_case cache_009_pos cleanup cache_009_pos_head() { atf_set "descr" "Offline and online a cache device succeed." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_009_pos_body() @@ -280,7 +280,7 @@ atf_test_case cache_010_neg cleanup cache_010_neg_head() { atf_set "descr" "Cache device can only be disk or slice." - atf_set "require.progs" zfs zpool mkfile + atf_set "require.progs" zfs zpool atf_set "timeout" 1200 } cache_010_neg_body() @@ -308,7 +308,7 @@ atf_test_case cache_011_pos cleanup cache_011_pos_head() { atf_set "descr" "Remove cache device from pool with spare device should succeed" - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 1200 } cache_011_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -79,7 +79,7 @@ atf_test_case cachefile_004_pos cachefile_004_pos_head() { atf_set "descr" "Verify set, export and destroy when cachefile is set on pool." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } cachefile_004_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -55,7 +55,7 @@ atf_test_case zfs_copies_002_pos cleanup zfs_copies_002_pos_head() { atf_set "descr" "Verify that the space used by multiple copies is charged correctly." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_copies_002_pos_body() { @@ -164,7 +164,7 @@ atf_test_case zfs_copies_006_pos cleanup zfs_copies_006_pos_head() { atf_set "descr" "Verify that ZFS volume space used by multiple copies is charged correctly." - atf_set "require.progs" mkfile zfs + atf_set "require.progs" zfs } zfs_copies_006_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -116,7 +116,7 @@ atf_test_case zfs_get_004_pos cleanup zfs_get_004_pos_head() { atf_set "descr" "Verify the functions of 'zfs get all' work." - atf_set "require.progs" zfs zpool mkfile + atf_set "require.progs" zfs zpool } zfs_get_004_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -220,7 +220,7 @@ atf_test_case zfs_mount_008_pos cleanup zfs_mount_008_pos_head() { atf_set "descr" "Verify 'zfs mount -O' will override existing mount point." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_mount_008_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -28,7 +28,7 @@ atf_test_case zfs_promote_001_pos cleanup zfs_promote_001_pos_head() { atf_set "descr" "'zfs promote' can promote a clone filesystem." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_promote_001_pos_body() { @@ -55,7 +55,7 @@ atf_test_case zfs_promote_002_pos cleanup zfs_promote_002_pos_head() { atf_set "descr" "'zfs promote' can deal with multiple snapshots in a filesystem." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_promote_002_pos_body() { @@ -82,7 +82,7 @@ atf_test_case zfs_promote_003_pos cleanup zfs_promote_003_pos_head() { atf_set "descr" "'zfs promote' can deal with multi-point snapshots." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_promote_003_pos_body() { @@ -109,7 +109,7 @@ atf_test_case zfs_promote_004_pos cleanup zfs_promote_004_pos_head() { atf_set "descr" "'zfs promote' can deal with multi-level clone." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_promote_004_pos_body() { @@ -190,7 +190,7 @@ atf_test_case zfs_promote_007_neg cleanup zfs_promote_007_neg_head() { atf_set "descr" "'zfs promote' can deal with name conflicts." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_promote_007_neg_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -78,7 +78,7 @@ atf_test_case zfs_receive_003_pos cleanup zfs_receive_003_pos_head() { atf_set "descr" "'zfs recv -F' to force rollback." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_receive_003_pos_body() { @@ -153,7 +153,7 @@ atf_test_case zfs_receive_006_pos cleanup zfs_receive_006_pos_head() { atf_set "descr" "'zfs recv -d <fs>' should succeed no matter ancestor filesystemexists." - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_receive_006_pos_body() { @@ -178,7 +178,7 @@ atf_test_case zfs_receive_007_neg cleanup zfs_receive_007_neg_head() { atf_set "descr" "'zfs recv -F' should fail if the incremental stream does not match" - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_receive_007_neg_body() { @@ -203,7 +203,7 @@ atf_test_case zfs_receive_008_pos cleanup zfs_receive_008_pos_head() { atf_set "descr" "Verifying 'zfs receive -vn [<filesystem|snapshot>]and zfs receive -vn -d <filesystem>'" - atf_set "require.progs" zfs mkfile + atf_set "require.progs" zfs } zfs_receive_008_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_005_neg.ksh Wed Aug 23 20:28:25 2017 (r322822) @@ -80,7 +80,7 @@ log_assert "'zfs rename' should fail while datasets ar additional_setup typeset FILESIZE=64m -log_must $MKFILE $FILESIZE $TESTDIR/$TESTFILE1 +log_must $TRUNCATE -s $FILESIZE $TESTDIR/$TESTFILE1 create_pool $TESTPOOL1 $TESTDIR/$TESTFILE1 for src in ${src_dataset[@]} ; do Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -136,7 +136,7 @@ atf_test_case zfs_rename_005_neg cleanup zfs_rename_005_neg_head() { atf_set "descr" "'zfs rename' should fail while datasets are within different pool." - atf_set "require.progs" mkfile zfs + atf_set "require.progs" zfs } zfs_rename_005_neg_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -53,7 +53,7 @@ atf_test_case zpool_002_pos cleanup zpool_002_pos_head() { atf_set "descr" "With ZFS_ABORT set, all zpool commands can abort and generate a core file." - atf_set "require.progs" mkfile zpool coreadm + atf_set "require.progs" zpool coreadm } zpool_002_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -175,7 +175,7 @@ zpool_add_006_pos_head() { atf_set "descr" "'zpool add [-f]' can add large numbers of vdevs to the specified pool without any errors." atf_set "require.config" disks_are_physical - atf_set "require.progs" zfs mkfile zpool + atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } zpool_add_006_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -28,7 +28,7 @@ atf_test_case zpool_clear_001_pos cleanup zpool_clear_001_pos_head() { atf_set "descr" "Verify 'zpool clear' can clear errors of a storage pool." - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs atf_set "timeout" 2100 } zpool_clear_001_pos_body() @@ -54,7 +54,7 @@ atf_test_case zpool_clear_002_neg cleanup zpool_clear_002_neg_head() { atf_set "descr" "Execute 'zpool clear' using invalid parameters." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_002_neg_body() @@ -80,7 +80,7 @@ atf_test_case zpool_clear_003_neg cleanup zpool_clear_003_neg_head() { atf_set "descr" "Verify 'zpool clear' cannot clear error for available spare devices." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_003_neg_body() @@ -105,7 +105,7 @@ atf_test_case zpool_clear_004_pos cleanup zpool_clear_004_pos_head() { atf_set "descr" "Verify 'zpool clear' can work on spare vdevs" - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2100 } zpool_clear_004_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -29,7 +29,7 @@ zpool_create_001_pos_head() { atf_set "descr" "'zpool create <pool> <vspec> ...' can successfully createa new pool with a name in ZFS namespace." atf_set "require.config" disks_are_physical - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2400 } zpool_create_001_pos_body() @@ -58,7 +58,7 @@ zpool_create_002_pos_head() { atf_set "descr" "'zpool create -f <pool> <vspec> ...' can successfully createa new pool in some cases." atf_set "require.config" disks_are_physical - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2400 } zpool_create_002_pos_body() @@ -116,7 +116,7 @@ zpool_create_004_pos_head() { atf_set "descr" "'zpool create [-f]' can create a storage pool with large numbers of vdevswithout any errors." atf_set "require.config" disks_are_physical - atf_set "require.progs" zfs mkfile zpool + atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } zpool_create_004_pos_body() @@ -145,7 +145,7 @@ zpool_create_005_pos_head() { atf_set "descr" "'zpool create [-R root][-m mountpoint] <pool> <vdev> ...' can createan alternate pool or a new pool mounted at the specified mountpoint." atf_set "require.config" disks_are_physical - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs atf_set "timeout" 2400 } zpool_create_005_pos_body() @@ -174,7 +174,7 @@ zpool_create_006_pos_head() { atf_set "descr" "Verify 'zpool create' succeed with keywords combination." atf_set "require.config" disks_are_physical - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool atf_set "timeout" 2400 } zpool_create_006_pos_body() @@ -290,7 +290,7 @@ zpool_create_010_neg_head() { atf_set "descr" "'zpool create' should return an error with VDEVs <64mb" atf_set "require.config" disks_are_physical - atf_set "require.progs" zfs mkfile zpool + atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } zpool_create_010_neg_body() @@ -406,7 +406,7 @@ zpool_create_014_neg_head() { atf_set "descr" "'zpool create' should fail with regular file in swap." atf_set "require.config" disks_are_physical - atf_set "require.progs" zfs mkfile swap zpool + atf_set "require.progs" zfs swap zpool atf_set "timeout" 2400 } zpool_create_014_neg_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -103,7 +103,7 @@ atf_test_case zpool_export_004_pos cleanup zpool_export_004_pos_head() { atf_set "descr" "Verify zpool export succeed or fail with spare." - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_export_004_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_005_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_005_pos.ksh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_005_pos.ksh Wed Aug 23 20:28:25 2017 (r322822) @@ -91,10 +91,10 @@ function cleanup } log_onexit cleanup -log_must $MKFILE 64m $REGULAR -log_must $MKFILE 64m $LOG -log_must $MKFILE 64m $CACHE -log_must $MKFILE 64m $SPARE +log_must $TRUNCATE -s 64m $REGULAR +log_must $TRUNCATE -s 64m $LOG +log_must $TRUNCATE -s 64m $CACHE +log_must $TRUNCATE -s 64m $SPARE log_must $MDCONFIG -t vnode -a -f $REGULAR -u $REGULAR_U log_must $MDCONFIG -t vnode -a -f $LOG -u $LOG_U log_must $MDCONFIG -t vnode -a -f $CACHE -u $CACHE_U Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -29,7 +29,7 @@ zpool_import_002_pos_head() { atf_set "descr" "Verify that an exported pool can be imported and cannot be imported more than once." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool sum mkfile zdb + atf_set "require.progs" zfs zpool sum zdb atf_set "timeout" 2400 } zpool_import_002_pos_body() @@ -56,7 +56,7 @@ zpool_import_003_pos_head() { atf_set "descr" "Destroyed pools are not listed unless with -D option is specified." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs atf_set "timeout" 2400 } zpool_import_003_pos_body() @@ -83,7 +83,7 @@ zpool_import_004_pos_head() { atf_set "descr" "Destroyed pools devices was moved to another directory,it still can be imported correctly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_004_pos_body() @@ -110,7 +110,7 @@ zpool_import_005_pos_head() { atf_set "descr" "Destroyed pools devices was renamed, it still can be importedcorrectly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_005_pos_body() @@ -137,7 +137,7 @@ zpool_import_006_pos_head() { atf_set "descr" "For mirror, N-1 destroyed pools devices was removed or usedby other pool, it still can be imported correctly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_006_pos_body() @@ -164,7 +164,7 @@ zpool_import_007_pos_head() { atf_set "descr" "For raidz, one destroyed pools devices was removed or used byother pool, it still can be imported correctly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_007_pos_body() @@ -191,7 +191,7 @@ zpool_import_008_pos_head() { atf_set "descr" "For raidz2, two destroyed pools devices was removed or used byother pool, it still can be imported correctly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_008_pos_body() @@ -218,7 +218,7 @@ zpool_import_009_neg_head() { atf_set "descr" "Badly-formed 'zpool import' with inapplicable scenariosshould return an error." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool mkfile + atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } zpool_import_009_neg_body() @@ -245,7 +245,7 @@ zpool_import_010_pos_head() { atf_set "descr" "'zpool -D -a' can import all the specified directoriesdestroyed pools." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs atf_set "timeout" 2400 } zpool_import_010_pos_body() @@ -272,7 +272,7 @@ zpool_import_011_neg_head() { atf_set "descr" "For strip pool, any destroyed pool devices was demaged,zpool import -D will failed." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_011_neg_body() @@ -299,7 +299,7 @@ zpool_import_012_pos_head() { atf_set "descr" "Verify all mount & share status of sub-filesystems within a poolcan be restored after import [-Df]." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool mkfile zdb share + atf_set "require.progs" zfs zpool zdb share atf_set "timeout" 2400 } zpool_import_012_pos_body() @@ -326,7 +326,7 @@ zpool_import_013_neg_head() { atf_set "descr" "'zpool import' fail while pool may be in use from other system,it need import forcefully." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool mkfile + atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } zpool_import_013_neg_body() @@ -379,7 +379,7 @@ zpool_import_all_001_pos_head() { atf_set "descr" "Verify that 'zpool import -a' succeeds as root." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool sum mkfile + atf_set "require.progs" zfs zpool sum atf_set "timeout" 2400 } zpool_import_all_001_pos_body() @@ -407,7 +407,7 @@ zpool_import_missing_001_pos_head() { atf_set "descr" "Verify that import could handle damaged or missing device." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zfs sum zpool zdb + atf_set "require.progs" zfs sum zpool zdb atf_set "timeout" 2400 } zpool_import_missing_001_pos_body() @@ -434,7 +434,7 @@ zpool_import_missing_002_pos_head() { atf_set "descr" "Verify that import could handle moving device." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool zfs zdb + atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } zpool_import_missing_002_pos_body() @@ -461,7 +461,7 @@ zpool_import_missing_003_pos_head() { atf_set "descr" "Verify that import could handle device overlapped." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool sum zfs + atf_set "require.progs" zpool sum zfs atf_set "timeout" 2400 } zpool_import_missing_003_pos_body() @@ -486,7 +486,7 @@ atf_test_case zpool_import_missing_004_pos zpool_import_missing_004_pos_head() { atf_set "descr" "Verify that zpool import succeeds when devices are missing" - atf_set "require.progs" mkfile zfs zpool + atf_set "require.progs" zfs zpool atf_set "timeout" 300 } zpool_import_missing_004_pos_body() @@ -502,7 +502,7 @@ atf_test_case zpool_import_missing_005_pos zpool_import_missing_005_pos_head() { atf_set "descr" "Verify that zpool import succeeds when devices of all types have been renamed" - atf_set "require.progs" mkfile mdconfig zfs zpool + atf_set "require.progs" mdconfig zfs zpool atf_set "timeout" 300 } zpool_import_missing_005_pos_body() @@ -520,7 +520,7 @@ zpool_import_rename_001_pos_head() { atf_set "descr" "Verify that an imported pool can be renamed." atf_set "require.config" at_least_2_disks - atf_set "require.progs" zfs zpool sum mkfile zdb + atf_set "require.progs" zfs zpool sum zdb atf_set "timeout" 2400 } zpool_import_rename_001_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -29,7 +29,7 @@ zpool_scrub_001_neg_head() { atf_set "descr" "Execute 'zpool scrub' using invalid parameters." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_scrub_001_neg_body() { @@ -55,7 +55,7 @@ zpool_scrub_002_pos_head() { atf_set "descr" "Verify scrub -s works correctly." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_scrub_002_pos_body() { @@ -81,7 +81,7 @@ zpool_scrub_003_pos_head() { atf_set "descr" "scrub command terminates the existing scrub process and starts a new scrub." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_scrub_003_pos_body() { @@ -107,7 +107,7 @@ zpool_scrub_004_pos_head() { atf_set "descr" "Resilver prevent scrub from starting until the resilver completes" atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_scrub_004_pos_body() { @@ -133,7 +133,7 @@ zpool_scrub_005_pos_head() { atf_set "descr" "When scrubbing, detach device should not break system." atf_set "require.config" at_least_2_disks - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_scrub_005_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -43,7 +43,7 @@ atf_test_case zpool_set_002_neg zpool_set_002_neg_head() { atf_set "descr" "Malformed zpool set commands are rejected" - atf_set "require.progs" mkfile zpool zfs + atf_set "require.progs" zpool zfs } zpool_set_002_neg_body() { @@ -58,7 +58,7 @@ atf_test_case zpool_set_003_neg zpool_set_003_neg_head() { atf_set "descr" "zpool set cannot set a readonly property" - atf_set "require.progs" mkfile zpool + atf_set "require.progs" zpool } zpool_set_003_neg_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Wed Aug 23 19:00:06 2017 (r322821) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Wed Aug 23 20:28:25 2017 (r322822) @@ -28,7 +28,7 @@ atf_test_case zdb_001_neg cleanup zdb_001_neg_head() { atf_set "descr" "zdb can't run as a user on datasets, but can run without arguments" - atf_set "require.progs" zfs mkfile fgrep zpool zdb + atf_set "require.progs" zfs fgrep zpool zdb atf_set "require.user" root } zdb_001_neg_body() @@ -54,7 +54,7 @@ atf_test_case zfs_001_neg cleanup zfs_001_neg_head() { atf_set "descr" "zfs shows a usage message when run as a user" - atf_set "require.progs" zfs mkfile fgrep zpool + atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root } zfs_001_neg_body() @@ -80,7 +80,7 @@ atf_test_case zfs_allow_001_neg cleanup zfs_allow_001_neg_head() { atf_set "descr" "zfs allow returns an error when run as a user" - atf_set "require.progs" zfs mkfile fgrep logname zpool + atf_set "require.progs" zfs fgrep logname zpool atf_set "require.user" root } zfs_allow_001_neg_body() @@ -106,7 +106,7 @@ atf_test_case zfs_clone_001_neg cleanup zfs_clone_001_neg_head() { atf_set "descr" "zfs clone returns an error when run as a user" - atf_set "require.progs" zfs mkfile fgrep zpool + atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root } zfs_clone_001_neg_body() @@ -132,7 +132,7 @@ atf_test_case zfs_create_001_neg cleanup zfs_create_001_neg_head() { atf_set "descr" "Verify zfs create without parameters fails." - atf_set "require.progs" zfs mkfile fgrep zpool + atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708232028.v7NKSPkv077763>