From owner-svn-src-projects@freebsd.org Mon Aug 28 00:05:27 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C238E0177E for ; Mon, 28 Aug 2017 00:05:27 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A01CE2CA9; Mon, 28 Aug 2017 00:05:26 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7S05PHG027745; Mon, 28 Aug 2017 00:05:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7S05Ond027732; Mon, 28 Aug 2017 00:05:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708280005.v7S05Ond027732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 28 Aug 2017 00:05:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322958 - in projects/runtime-coverage: . contrib/cortex-strings/src/aarch64 lib/libc/gen lib/libc/locale sbin/geom/class/eli sys/amd64/amd64 sys/boot/efi/boot1 sys/boot/efi/include sys... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . contrib/cortex-strings/src/aarch64 lib/libc/gen lib/libc/locale sbin/geom/class/eli sys/amd64/amd64 sys/boot/efi/boot1 sys/boot/efi/include sys/boot/efi/libefi sys/boot... X-SVN-Commit-Revision: 322958 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Aug 2017 00:05:27 -0000 Author: ngie Date: Mon Aug 28 00:05:24 2017 New Revision: 322958 URL: https://svnweb.freebsd.org/changeset/base/322958 Log: MFhead@r322957 Added: projects/runtime-coverage/sys/boot/efi/loader/efi_main.c - copied unchanged from r322957, head/sys/boot/efi/loader/efi_main.c Modified: projects/runtime-coverage/Makefile.inc1 projects/runtime-coverage/UPDATING projects/runtime-coverage/contrib/cortex-strings/src/aarch64/memcpy.S projects/runtime-coverage/lib/libc/gen/fnmatch.c projects/runtime-coverage/lib/libc/locale/setlocale.c projects/runtime-coverage/lib/libc/locale/setrunelocale.c projects/runtime-coverage/sbin/geom/class/eli/geli.8 projects/runtime-coverage/sbin/geom/class/eli/geom_eli.c projects/runtime-coverage/sys/amd64/amd64/cpu_switch.S projects/runtime-coverage/sys/amd64/amd64/exception.S projects/runtime-coverage/sys/boot/efi/boot1/Makefile projects/runtime-coverage/sys/boot/efi/boot1/boot1.c projects/runtime-coverage/sys/boot/efi/boot1/boot_module.h projects/runtime-coverage/sys/boot/efi/boot1/ufs_module.c projects/runtime-coverage/sys/boot/efi/boot1/zfs_module.c projects/runtime-coverage/sys/boot/efi/include/efiapi.h projects/runtime-coverage/sys/boot/efi/include/efidevp.h projects/runtime-coverage/sys/boot/efi/include/efilib.h projects/runtime-coverage/sys/boot/efi/libefi/libefi.c projects/runtime-coverage/sys/boot/efi/loader/Makefile projects/runtime-coverage/sys/boot/geli/geliboot.c projects/runtime-coverage/sys/boot/geli/geliboot.h projects/runtime-coverage/sys/boot/geli/geliboot_crypto.c projects/runtime-coverage/sys/boot/geli/geliboot_internal.h projects/runtime-coverage/sys/boot/geli/pwgets.c projects/runtime-coverage/sys/boot/i386/libi386/biosdisk.c projects/runtime-coverage/sys/dev/mpr/mpr.c projects/runtime-coverage/sys/dev/mpr/mpr_mapping.c projects/runtime-coverage/sys/dev/mpr/mpr_sas.c projects/runtime-coverage/sys/dev/mpr/mpr_sas_lsi.c projects/runtime-coverage/sys/dev/mpr/mpr_user.c projects/runtime-coverage/sys/dev/mps/mps.c projects/runtime-coverage/sys/dev/mps/mps_mapping.c projects/runtime-coverage/sys/dev/mps/mps_sas.c projects/runtime-coverage/sys/dev/mps/mps_sas_lsi.c projects/runtime-coverage/sys/dev/mps/mps_user.c projects/runtime-coverage/sys/dev/ppc/ppc_pci.c projects/runtime-coverage/sys/dev/rtwn/rtl8188e/r88e.h projects/runtime-coverage/sys/dev/rtwn/rtl8188e/r88e_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c.h projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_var.h projects/runtime-coverage/sys/dev/rtwn/rtl8192e/r92e_chan.c projects/runtime-coverage/sys/geom/eli/g_eli.c projects/runtime-coverage/sys/geom/eli/g_eli.h projects/runtime-coverage/sys/geom/eli/g_eli_ctl.c projects/runtime-coverage/sys/geom/geom_subr.c projects/runtime-coverage/sys/i386/i386/trap.c projects/runtime-coverage/sys/kern/kern_sysctl.c projects/runtime-coverage/sys/kern/subr_smp.c projects/runtime-coverage/sys/net80211/ieee80211_output.c Directory Properties: projects/runtime-coverage/ (props changed) Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/Makefile.inc1 Mon Aug 28 00:05:24 2017 (r322958) @@ -1985,8 +1985,12 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue=rescue/rescue .endif +.if ${MK_TCSH} != "no" +_tcsh=bin/csh +.endif + .for _tool in \ - bin/csh \ + ${_tcsh} \ bin/sh \ ${LOCAL_TOOL_DIRS} \ lib/ncurses/ncurses \ @@ -2151,7 +2155,7 @@ native-xtools: .PHONY bin/cat \ bin/chmod \ bin/cp \ - bin/csh \ + ${_tcsh} \ bin/echo \ bin/expr \ bin/hostname \ Modified: projects/runtime-coverage/UPDATING ============================================================================== --- projects/runtime-coverage/UPDATING Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/UPDATING Mon Aug 28 00:05:24 2017 (r322958) @@ -51,6 +51,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20170826: + During boot the geli passphrase will be hidden. To restore previous + behavior see geli(8) configuration options. + 20170825: Move PMTUD blackhole counters to TCPSTATS and remove them from bare sysctl values. Minor nit, but requires a rebuild of both world/kernel Modified: projects/runtime-coverage/contrib/cortex-strings/src/aarch64/memcpy.S ============================================================================== --- projects/runtime-coverage/contrib/cortex-strings/src/aarch64/memcpy.S Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/contrib/cortex-strings/src/aarch64/memcpy.S Mon Aug 28 00:05:24 2017 (r322958) @@ -77,8 +77,8 @@ #define D_h x13 #define E_l src #define E_h count -#define F_l srcend -#define F_h dst +#define F_l dst +#define F_h srcend #define tmp1 x9 #define L(l) .L ## l Modified: projects/runtime-coverage/lib/libc/gen/fnmatch.c ============================================================================== --- projects/runtime-coverage/lib/libc/gen/fnmatch.c Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/lib/libc/gen/fnmatch.c Mon Aug 28 00:05:24 2017 (r322958) @@ -249,7 +249,7 @@ rangematch(const char *pattern, wchar_t test, int flag * consistency with the regular expression syntax. * J.T. Conklin (conklin@ngai.kaleida.com) */ - if ( (negate = (*pattern == '!' || *pattern == '^')) ) + if ((negate = (*pattern == '!' || *pattern == '^'))) ++pattern; if (flags & FNM_CASEFOLD) Modified: projects/runtime-coverage/lib/libc/locale/setlocale.c ============================================================================== --- projects/runtime-coverage/lib/libc/locale/setlocale.c Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/lib/libc/locale/setlocale.c Mon Aug 28 00:05:24 2017 (r322958) @@ -42,48 +42,48 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* for _PATH_LOCALE */ +#include /* for _PATH_LOCALE */ #include #include #include #include "collate.h" -#include "lmonetary.h" /* for __monetary_load_locale() */ -#include "lnumeric.h" /* for __numeric_load_locale() */ -#include "lmessages.h" /* for __messages_load_locale() */ +#include "lmonetary.h" /* for __monetary_load_locale() */ +#include "lnumeric.h" /* for __numeric_load_locale() */ +#include "lmessages.h" /* for __messages_load_locale() */ #include "setlocale.h" #include "ldpart.h" -#include "../stdtime/timelocal.h" /* for __time_load_locale() */ +#include "../stdtime/timelocal.h" /* for __time_load_locale() */ /* * Category names for getenv() */ static const char categories[_LC_LAST][12] = { - "LC_ALL", - "LC_COLLATE", - "LC_CTYPE", - "LC_MONETARY", - "LC_NUMERIC", - "LC_TIME", - "LC_MESSAGES", + "LC_ALL", + "LC_COLLATE", + "LC_CTYPE", + "LC_MONETARY", + "LC_NUMERIC", + "LC_TIME", + "LC_MESSAGES", }; /* * Current locales for each category */ static char current_categories[_LC_LAST][ENCODING_LEN + 1] = { - "C", - "C", - "C", - "C", - "C", - "C", - "C", + "C", + "C", + "C", + "C", + "C", + "C", + "C", }; /* * Path to locale storage directory */ -char *_PathLocale; +char *_PathLocale; /* * The locales we are going to try and load @@ -93,21 +93,20 @@ static char saved_categories[_LC_LAST][ENCODING_LEN + static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)]; -static char *currentlocale(void); -static char *loadlocale(int); +static char *currentlocale(void); +static char *loadlocale(int); const char *__get_locale_env(int); char * setlocale(int category, const char *locale) { int i, j, len, saverr; - const char *env, *r; + const char *env, *r; if (category < LC_ALL || category >= _LC_LAST) { errno = EINVAL; return (NULL); } - if (locale == NULL) return (category != LC_ALL ? current_categories[category] : currentlocale()); @@ -162,13 +161,13 @@ setlocale(int category, const char *locale) } do { if (i == _LC_LAST) - break; /* Too many slashes... */ + break; /* Too many slashes... */ if ((len = r - locale) > ENCODING_LEN) { errno = EINVAL; return (NULL); } (void)strlcpy(new_categories[i], locale, - len + 1); + len + 1); i++; while (*r == '/') r++; @@ -178,7 +177,7 @@ setlocale(int category, const char *locale) } while (*locale); while (i < _LC_LAST) { (void)strcpy(new_categories[i], - new_categories[i-1]); + new_categories[i - 1]); i++; } } @@ -193,7 +192,7 @@ setlocale(int category, const char *locale) saverr = errno; for (j = 1; j < i; j++) { (void)strcpy(new_categories[j], - saved_categories[j]); + saved_categories[j]); if (loadlocale(j) == NULL) { (void)strcpy(new_categories[j], "C"); (void)loadlocale(j); @@ -218,7 +217,7 @@ currentlocale(void) for (i = 2; i < _LC_LAST; ++i) { (void)strcat(current_locale_string, "/"); (void)strcat(current_locale_string, - current_categories[i]); + current_categories[i]); } break; } @@ -230,16 +229,15 @@ loadlocale(int category) { char *new = new_categories[category]; char *old = current_categories[category]; - int (*func)(const char *); + int (*func) (const char *); int saved_errno; if ((new[0] == '.' && - (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) || + (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) || strchr(new, '/') != NULL) { errno = EINVAL; return (NULL); } - saved_errno = errno; errno = __detect_path_locale(); if (errno != 0) @@ -285,22 +283,22 @@ loadlocale(int category) const char * __get_locale_env(int category) { - const char *env; + const char *env; - /* 1. check LC_ALL. */ - env = getenv(categories[0]); + /* 1. check LC_ALL. */ + env = getenv(categories[0]); - /* 2. check LC_* */ + /* 2. check LC_* */ if (env == NULL || !*env) - env = getenv(categories[category]); + env = getenv(categories[category]); - /* 3. check LANG */ + /* 3. check LANG */ if (env == NULL || !*env) - env = getenv("LANG"); + env = getenv("LANG"); - /* 4. if none is set, fall to "C" */ + /* 4. if none is set, fall to "C" */ if (env == NULL || !*env) - env = "C"; + env = "C"; return (env); } @@ -326,4 +324,3 @@ __detect_path_locale(void) } return (0); } - Modified: projects/runtime-coverage/lib/libc/locale/setrunelocale.c ============================================================================== --- projects/runtime-coverage/lib/libc/locale/setrunelocale.c Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/lib/libc/locale/setrunelocale.c Mon Aug 28 00:05:24 2017 (r322958) @@ -38,7 +38,7 @@ #include __FBSDID("$FreeBSD$"); -#define __RUNETYPE_INTERNAL 1 +#define __RUNETYPE_INTERNAL 1 #include #include @@ -72,7 +72,7 @@ destruct_ctype(void *v) { struct xlocale_ctype *l = v; - if (&_DefaultRuneLocale != l->runes) + if (&_DefaultRuneLocale != l->runes) free(l->runes); free(l); } @@ -81,7 +81,7 @@ const _RuneLocale * __getCurrentRuneLocale(void) { - return XLOCALE_CTYPE(__get_locale())->runes; + return (XLOCALE_CTYPE(__get_locale())->runes); } static void @@ -144,7 +144,7 @@ __setrunelocale(struct xlocale_ctype *l, const char *e else if (strcmp(rl->__encoding, "EUC-TW") == 0) ret = _EUC_TW_init(l, rl); else if (strcmp(rl->__encoding, "GB18030") == 0) - ret = _GB18030_init(l, rl); + ret = _GB18030_init(l, rl); else if (strcmp(rl->__encoding, "GB2312") == 0) ret = _GB2312_init(l, rl); else if (strcmp(rl->__encoding, "GBK") == 0) @@ -204,10 +204,9 @@ __ctype_load(const char *locale, locale_t unused __unu struct xlocale_ctype *l = calloc(sizeof(struct xlocale_ctype), 1); l->header.header.destructor = destruct_ctype; - if (__setrunelocale(l, locale)) - { + if (__setrunelocale(l, locale)) { free(l); - return NULL; + return (NULL); } - return l; + return (l); } Modified: projects/runtime-coverage/sbin/geom/class/eli/geli.8 ============================================================================== --- projects/runtime-coverage/sbin/geom/class/eli/geli.8 Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sbin/geom/class/eli/geli.8 Mon Aug 28 00:05:24 2017 (r322958) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 3, 2016 +.Dd August 26, 2017 .Dt GELI 8 .Os .Sh NAME @@ -51,7 +51,7 @@ utility: .Pp .Nm .Cm init -.Op Fl bgPTv +.Op Fl bdgPTv .Op Fl a Ar aalgo .Op Fl B Ar backupfile .Op Fl e Ar ealgo @@ -88,7 +88,7 @@ utility: .Ar prov .Nm .Cm configure -.Op Fl bBgGtT +.Op Fl bBdDgGtT .Ar prov ... .Nm .Cm setkey @@ -279,6 +279,9 @@ To inhibit backups, you can use .Pa none as the .Ar backupfile . +.It Fl d +While booting from this encrypted root filesystem enable visibility of +passphrase length. .It Fl e Ar ealgo Encryption algorithm to use. Currently supported algorithms are: @@ -490,6 +493,12 @@ For more information, see the description of the subcommand. .It Fl B Remove the BOOT flag from the given providers. +.It Fl d +While booting from this encrypted root filesystem enable visibility of +passphrase length. +.It Fl D +While booting from this encrypted root filesystem disable visibility of +passphrase length. .It Fl g Enable booting from this encrypted root filesystem. The boot loader prompts for the passphrase and loads Modified: projects/runtime-coverage/sbin/geom/class/eli/geom_eli.c ============================================================================== --- projects/runtime-coverage/sbin/geom/class/eli/geom_eli.c Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sbin/geom/class/eli/geom_eli.c Mon Aug 28 00:05:24 2017 (r322958) @@ -82,7 +82,7 @@ static int eli_backup_create(struct gctl_req *req, con /* * Available commands: * - * init [-bgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov + * init [-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov * label - alias for 'init' * attach [-dprv] [-j passfile] [-k keyfile] prov * detach [-fl] prov ... @@ -107,6 +107,7 @@ struct g_command class_commands[] = { { 'a', "aalgo", "", G_TYPE_STRING }, { 'b', "boot", NULL, G_TYPE_BOOL }, { 'B', "backupfile", "", G_TYPE_STRING }, + { 'd', "displaypass", NULL, G_TYPE_BOOL }, { 'e', "ealgo", "", G_TYPE_STRING }, { 'g', "geliboot", NULL, G_TYPE_BOOL }, { 'i', "iterations", "-1", G_TYPE_NUMBER }, @@ -119,13 +120,14 @@ struct g_command class_commands[] = { { 'V', "mdversion", "-1", G_TYPE_NUMBER }, G_OPT_SENTINEL }, - "[-bgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov" + "[-bdgPTv] [-a aalgo] [-B backupfile] [-e ealgo] [-i iterations] [-l keylen] [-J newpassfile] [-K newkeyfile] [-s sectorsize] [-V version] prov" }, { "label", G_FLAG_VERBOSE, eli_main, { { 'a', "aalgo", "", G_TYPE_STRING }, { 'b', "boot", NULL, G_TYPE_BOOL }, { 'B', "backupfile", "", G_TYPE_STRING }, + { 'd', "displaypass", NULL, G_TYPE_BOOL }, { 'e', "ealgo", "", G_TYPE_STRING }, { 'g', "geliboot", NULL, G_TYPE_BOOL }, { 'i', "iterations", "-1", G_TYPE_NUMBER }, @@ -182,13 +184,15 @@ struct g_command class_commands[] = { { { 'b', "boot", NULL, G_TYPE_BOOL }, { 'B', "noboot", NULL, G_TYPE_BOOL }, + { 'd', "displaypass", NULL, G_TYPE_BOOL }, + { 'D', "nodisplaypass", NULL, G_TYPE_BOOL }, { 'g', "geliboot", NULL, G_TYPE_BOOL }, { 'G', "nogeliboot", NULL, G_TYPE_BOOL }, { 't', "trim", NULL, G_TYPE_BOOL }, { 'T', "notrim", NULL, G_TYPE_BOOL }, G_OPT_SENTINEL }, - "[-bBgGtT] prov ..." + "[-bBdDgGtT] prov ..." }, { "setkey", G_FLAG_VERBOSE, eli_main, { @@ -708,6 +712,8 @@ eli_init(struct gctl_req *req) md.md_flags |= G_ELI_FLAG_BOOT; if (gctl_get_int(req, "geliboot")) md.md_flags |= G_ELI_FLAG_GELIBOOT; + if (gctl_get_int(req, "displaypass")) + md.md_flags |= G_ELI_FLAG_GELIDISPLAYPASS; if (gctl_get_int(req, "notrim")) md.md_flags |= G_ELI_FLAG_NODELETE; md.md_ealgo = CRYPTO_ALGORITHM_MIN - 1; @@ -912,7 +918,7 @@ eli_attach(struct gctl_req *req) static void eli_configure_detached(struct gctl_req *req, const char *prov, int boot, - int geliboot, int trim) + int geliboot, int displaypass, int trim) { struct g_eli_metadata md; bool changed = 0; @@ -948,6 +954,21 @@ eli_configure_detached(struct gctl_req *req, const cha changed = 1; } + if (displaypass == 1 && (md.md_flags & G_ELI_FLAG_GELIDISPLAYPASS)) { + if (verbose) + printf("GELIDISPLAYPASS flag already configured for %s.\n", prov); + } else if (displaypass == 0 && + !(md.md_flags & G_ELI_FLAG_GELIDISPLAYPASS)) { + if (verbose) + printf("GELIDISPLAYPASS flag not configured for %s.\n", prov); + } else if (displaypass >= 0) { + if (displaypass) + md.md_flags |= G_ELI_FLAG_GELIDISPLAYPASS; + else + md.md_flags &= ~G_ELI_FLAG_GELIDISPLAYPASS; + changed = 1; + } + if (trim == 0 && (md.md_flags & G_ELI_FLAG_NODELETE)) { if (verbose) printf("TRIM disable flag already configured for %s.\n", prov); @@ -971,8 +992,9 @@ static void eli_configure(struct gctl_req *req) { const char *prov; - bool boot, noboot, geliboot, nogeliboot, trim, notrim; - int doboot, dogeliboot, dotrim; + bool boot, noboot, geliboot, nogeliboot, displaypass, nodisplaypass; + bool trim, notrim; + int doboot, dogeliboot, dodisplaypass, dotrim; int i, nargs; nargs = gctl_get_int(req, "nargs"); @@ -985,6 +1007,8 @@ eli_configure(struct gctl_req *req) noboot = gctl_get_int(req, "noboot"); geliboot = gctl_get_int(req, "geliboot"); nogeliboot = gctl_get_int(req, "nogeliboot"); + displaypass = gctl_get_int(req, "displaypass"); + nodisplaypass = gctl_get_int(req, "nodisplaypass"); trim = gctl_get_int(req, "trim"); notrim = gctl_get_int(req, "notrim"); @@ -1008,6 +1032,16 @@ eli_configure(struct gctl_req *req) else if (nogeliboot) dogeliboot = 0; + dodisplaypass = -1; + if (displaypass && nodisplaypass) { + gctl_error(req, "Options -d and -D are mutually exclusive."); + return; + } + if (displaypass) + dodisplaypass = 1; + else if (nodisplaypass) + dodisplaypass = 0; + dotrim = -1; if (trim && notrim) { gctl_error(req, "Options -t and -T are mutually exclusive."); @@ -1018,7 +1052,8 @@ eli_configure(struct gctl_req *req) else if (notrim) dotrim = 0; - if (doboot == -1 && dogeliboot == -1 && dotrim == -1) { + if (doboot == -1 && dogeliboot == -1 && dodisplaypass == -1 && + dotrim == -1) { gctl_error(req, "No option given."); return; } @@ -1028,8 +1063,10 @@ eli_configure(struct gctl_req *req) /* Now the rest. */ for (i = 0; i < nargs; i++) { prov = gctl_get_ascii(req, "arg%d", i); - if (!eli_is_attached(prov)) - eli_configure_detached(req, prov, doboot, dogeliboot, dotrim); + if (!eli_is_attached(prov)) { + eli_configure_detached(req, prov, doboot, dogeliboot, + dodisplaypass, dotrim); + } } } Modified: projects/runtime-coverage/sys/amd64/amd64/cpu_switch.S ============================================================================== --- projects/runtime-coverage/sys/amd64/amd64/cpu_switch.S Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sys/amd64/amd64/cpu_switch.S Mon Aug 28 00:05:24 2017 (r322958) @@ -108,7 +108,7 @@ ENTRY(cpu_switch) movl %fs,%eax cmpl $KUF32SEL,%eax jne 1f - rdfsbaseq %rax + rdfsbase %rax movq %rax,PCB_FSBASE(%r8) 1: movl %gs,%eax cmpl $KUG32SEL,%eax Modified: projects/runtime-coverage/sys/amd64/amd64/exception.S ============================================================================== --- projects/runtime-coverage/sys/amd64/amd64/exception.S Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sys/amd64/amd64/exception.S Mon Aug 28 00:05:24 2017 (r322958) @@ -340,10 +340,10 @@ prot_addrf: jz 2f cmpw $KUF32SEL,TF_FS(%rsp) jne 1f - rdfsbaseq %rax + rdfsbase %rax 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f - rdgsbaseq %rdx + rdgsbase %rdx 2: swapgs movq PCPU(CURPCB),%rdi testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) @@ -533,7 +533,7 @@ nmi_fromuserspace: jz 2f cmpw $KUF32SEL,TF_FS(%rsp) jne 1f - rdfsbaseq %rax + rdfsbase %rax movq %rax,PCB_FSBASE(%rdi) 1: cmpw $KUG32SEL,TF_GS(%rsp) jne 2f Modified: projects/runtime-coverage/sys/boot/efi/boot1/Makefile ============================================================================== --- projects/runtime-coverage/sys/boot/efi/boot1/Makefile Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sys/boot/efi/boot1/Makefile Mon Aug 28 00:05:24 2017 (r322958) @@ -11,7 +11,6 @@ PROG= boot1.sym INTERNALPROG= WARNS?= 6 -.if ${MK_ZFS} != "no" # Disable warnings that are currently incompatible with the zfs boot code CWARNFLAGS.zfs_module.c += -Wno-array-bounds CWARNFLAGS.zfs_module.c += -Wno-cast-align @@ -26,7 +25,6 @@ CWARNFLAGS.skein.c += -Wno-missing-variable-declaratio .else if ${COMPILER_TYPE} == "gcc" CWARNFLAGS.skein.c += -Wno-missing-declarations .endif -.endif # architecture-specific loader code SRCS= boot1.c self_reloc.c start.S ufs_module.c @@ -79,13 +77,15 @@ CFLAGS+= -fPIC LDFLAGS+= -Wl,-znocombreloc .endif +LIBEFI= ${.OBJDIR}/../libefi/libefi.a + # # Add libstand for the runtime functions used by the compiler - for example # __aeabi_* (arm) or __divdi3 (i386). # as well as required string and memory functions for all platforms. # -DPADD+= ${LIBSTAND} -LDADD+= -lstand +DPADD+= ${LIBEFI} ${LIBSTAND} +LDADD+= ${LIBEFI} -lstand DPADD+= ${LDSCRIPT} Modified: projects/runtime-coverage/sys/boot/efi/boot1/boot1.c ============================================================================== --- projects/runtime-coverage/sys/boot/efi/boot1/boot1.c Sun Aug 27 22:13:03 2017 (r322957) +++ projects/runtime-coverage/sys/boot/efi/boot1/boot1.c Mon Aug 28 00:05:24 2017 (r322958) @@ -47,12 +47,6 @@ static const boot_module_t *boot_modules[] = /* The initial number of handles used to query EFI for partitions. */ #define NUM_HANDLES_INIT 24 -EFI_STATUS efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE* Xsystab); - -EFI_SYSTEM_TABLE *systab; -EFI_BOOT_SERVICES *bs; -static EFI_HANDLE *image; - static EFI_GUID BlockIoProtocolGUID = BLOCK_IO_PROTOCOL; static EFI_GUID DevicePathGUID = DEVICE_PATH_PROTOCOL; static EFI_GUID LoadedImageGUID = LOADED_IMAGE_PROTOCOL; @@ -68,7 +62,7 @@ Malloc(size_t len, const char *file __unused, int line { void *out; - if (bs->AllocatePool(EfiLoaderData, len, &out) == EFI_SUCCESS) + if (BS->AllocatePool(EfiLoaderData, len, &out) == EFI_SUCCESS) return (out); return (NULL); @@ -78,57 +72,10 @@ void Free(void *buf, const char *file __unused, int line __unused) { if (buf != NULL) - (void)bs->FreePool(buf); + (void)BS->FreePool(buf); } /* - * nodes_match returns TRUE if the imgpath isn't NULL and the nodes match, - * FALSE otherwise. - */ -static BOOLEAN -nodes_match(EFI_DEVICE_PATH *imgpath, EFI_DEVICE_PATH *devpath) -{ - int len; - - if (imgpath == NULL || imgpath->Type != devpath->Type || - imgpath->SubType != devpath->SubType) - return (FALSE); - - len = DevicePathNodeLength(imgpath); - if (len != DevicePathNodeLength(devpath)) - return (FALSE); - - return (memcmp(imgpath, devpath, (size_t)len) == 0); -} - -/* - * device_paths_match returns TRUE if the imgpath isn't NULL and all nodes - * in imgpath and devpath match up to their respective occurrences of a - * media node, FALSE otherwise. - */ -static BOOLEAN -device_paths_match(EFI_DEVICE_PATH *imgpath, EFI_DEVICE_PATH *devpath) -{ - - if (imgpath == NULL) - return (FALSE); - - while (!IsDevicePathEnd(imgpath) && !IsDevicePathEnd(devpath)) { - if (IsDevicePathType(imgpath, MEDIA_DEVICE_PATH) && - IsDevicePathType(devpath, MEDIA_DEVICE_PATH)) - return (TRUE); - - if (!nodes_match(imgpath, devpath)) - return (FALSE); - - imgpath = NextDevicePathNode(imgpath); - devpath = NextDevicePathNode(devpath); - } - - return (FALSE); -} - -/* * devpath_last returns the last non-path end node in devpath. */ static EFI_DEVICE_PATH * @@ -142,178 +89,6 @@ devpath_last(EFI_DEVICE_PATH *devpath) } /* - * devpath_node_str is a basic output method for a devpath node which - * only understands a subset of the available sub types. - * - * If we switch to UEFI 2.x then we should update it to use: - * EFI_DEVICE_PATH_TO_TEXT_PROTOCOL. - */ -static int -devpath_node_str(char *buf, size_t size, EFI_DEVICE_PATH *devpath) -{ - - switch (devpath->Type) { - case MESSAGING_DEVICE_PATH: - switch (devpath->SubType) { - case MSG_ATAPI_DP: { - ATAPI_DEVICE_PATH *atapi; - - atapi = (ATAPI_DEVICE_PATH *)(void *)devpath; - return snprintf(buf, size, "ata(%s,%s,0x%x)", - (atapi->PrimarySecondary == 1) ? "Sec" : "Pri", - (atapi->SlaveMaster == 1) ? "Slave" : "Master", - atapi->Lun); - } - case MSG_USB_DP: { - USB_DEVICE_PATH *usb; - - usb = (USB_DEVICE_PATH *)devpath; - return snprintf(buf, size, "usb(0x%02x,0x%02x)", - usb->ParentPortNumber, usb->InterfaceNumber); - } - case MSG_SCSI_DP: { - SCSI_DEVICE_PATH *scsi; - - scsi = (SCSI_DEVICE_PATH *)(void *)devpath; - return snprintf(buf, size, "scsi(0x%02x,0x%02x)", - scsi->Pun, scsi->Lun); - } - case MSG_SATA_DP: { - SATA_DEVICE_PATH *sata; - - sata = (SATA_DEVICE_PATH *)(void *)devpath; - return snprintf(buf, size, "sata(0x%x,0x%x,0x%x)", - sata->HBAPortNumber, sata->PortMultiplierPortNumber, - sata->Lun); - } - default: - return snprintf(buf, size, "msg(0x%02x)", - devpath->SubType); - } - break; - case HARDWARE_DEVICE_PATH: - switch (devpath->SubType) { - case HW_PCI_DP: { - PCI_DEVICE_PATH *pci; - - pci = (PCI_DEVICE_PATH *)devpath; - return snprintf(buf, size, "pci(0x%02x,0x%02x)", - pci->Device, pci->Function); - } - default: - return snprintf(buf, size, "hw(0x%02x)", - devpath->SubType); - } - break; - case ACPI_DEVICE_PATH: { - ACPI_HID_DEVICE_PATH *acpi; - - acpi = (ACPI_HID_DEVICE_PATH *)(void *)devpath; - if ((acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) { - switch (EISA_ID_TO_NUM(acpi->HID)) { - case 0x0a03: - return snprintf(buf, size, "pciroot(0x%x)", - acpi->UID); - case 0x0a08: - return snprintf(buf, size, "pcieroot(0x%x)", - acpi->UID); - case 0x0604: - return snprintf(buf, size, "floppy(0x%x)", - acpi->UID); - case 0x0301: - return snprintf(buf, size, "keyboard(0x%x)", - acpi->UID); - case 0x0501: - return snprintf(buf, size, "serial(0x%x)", - acpi->UID); - case 0x0401: - return snprintf(buf, size, "parallelport(0x%x)", - acpi->UID); - default: - return snprintf(buf, size, "acpi(pnp%04x,0x%x)", - EISA_ID_TO_NUM(acpi->HID), acpi->UID); - } - } - - return snprintf(buf, size, "acpi(0x%08x,0x%x)", acpi->HID, - acpi->UID); - } - case MEDIA_DEVICE_PATH: - switch (devpath->SubType) { - case MEDIA_CDROM_DP: { - CDROM_DEVICE_PATH *cdrom; - - cdrom = (CDROM_DEVICE_PATH *)(void *)devpath; - return snprintf(buf, size, "cdrom(%x)", - cdrom->BootEntry); - } - case MEDIA_HARDDRIVE_DP: { - HARDDRIVE_DEVICE_PATH *hd; - - hd = (HARDDRIVE_DEVICE_PATH *)(void *)devpath; - return snprintf(buf, size, "hd(%x)", - hd->PartitionNumber); - } - default: - return snprintf(buf, size, "media(0x%02x)", - devpath->SubType); - } - case BBS_DEVICE_PATH: - return snprintf(buf, size, "bbs(0x%02x)", devpath->SubType); - case END_DEVICE_PATH_TYPE: - return (0); - } - - return snprintf(buf, size, "type(0x%02x, 0x%02x)", devpath->Type, - devpath->SubType); -} - -/* - * devpath_strlcat appends a text description of devpath to buf but not more - * than size - 1 characters followed by NUL-terminator. - */ -int -devpath_strlcat(char *buf, size_t size, EFI_DEVICE_PATH *devpath) -{ - size_t len, used; - const char *sep; - - sep = ""; - used = 0; - while (!IsDevicePathEnd(devpath)) { - len = snprintf(buf, size - used, "%s", sep); - used += len; - if (used > size) - return (used); - buf += len; - - len = devpath_node_str(buf, size - used, devpath); - used += len; - if (used > size) - return (used); - buf += len; - devpath = NextDevicePathNode(devpath); - sep = ":"; - } - - return (used); -} - -/* - * devpath_str is convenience method which returns the text description of - * devpath using a static buffer, so it isn't thread safe! - */ -char * -devpath_str(EFI_DEVICE_PATH *devpath) -{ - static char buf[256]; - - devpath_strlcat(buf, sizeof(buf), devpath); - - return buf; -} - -/* * load_loader attempts to load the loader image data. * * It tries each module and its respective devices, identified by mod->probe, @@ -400,14 +175,14 @@ try_boot(void) buf = NULL; } - if ((status = bs->LoadImage(TRUE, image, devpath_last(dev->devpath), + if ((status = BS->LoadImage(TRUE, IH, devpath_last(dev->devpath), loaderbuf, loadersize, &loaderhandle)) != EFI_SUCCESS) { printf("Failed to load image provided by %s, size: %zu, (%lu)\n", mod->name, loadersize, EFI_ERROR_CODE(status)); goto errout; } - if ((status = bs->HandleProtocol(loaderhandle, &LoadedImageGUID, + if ((status = BS->HandleProtocol(loaderhandle, &LoadedImageGUID, (VOID**)&loaded_image)) != EFI_SUCCESS) { printf("Failed to query LoadedImage provided by %s (%lu)\n", mod->name, EFI_ERROR_CODE(status)); @@ -433,7 +208,7 @@ try_boot(void) DSTALL(1000000); DPRINTF(".\n"); - if ((status = bs->StartImage(loaderhandle, NULL, NULL)) != + if ((status = BS->StartImage(loaderhandle, NULL, NULL)) != EFI_SUCCESS) { printf("Failed to start image provided by %s (%lu)\n", mod->name, EFI_ERROR_CODE(status)); @@ -467,7 +242,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath, B UINTN i; /* Figure out if we're dealing with an actual partition. */ - status = bs->HandleProtocol(h, &DevicePathGUID, (void **)&devpath); + status = BS->HandleProtocol(h, &DevicePathGUID, (void **)&devpath); if (status == EFI_UNSUPPORTED) return (status); @@ -476,10 +251,14 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath, B EFI_ERROR_CODE(status)); return (status); } - - DPRINTF("probing: %s\n", devpath_str(devpath)); - - status = bs->HandleProtocol(h, &BlockIoProtocolGUID, (void **)&blkio); +#ifdef EFI_DEBUG + { + CHAR16 *text = efi_devpath_name(devpath); + DPRINTF("probing: %S\n", text); + efi_free_devpath_name(text); + } +#endif + status = BS->HandleProtocol(h, &BlockIoProtocolGUID, (void **)&blkio); if (status == EFI_UNSUPPORTED) return (status); @@ -492,11 +271,11 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath, B if (!blkio->Media->LogicalPartition) return (EFI_UNSUPPORTED); - *preferred = device_paths_match(imgpath, devpath); + *preferred = efi_devpath_match(imgpath, devpath); /* Run through each module, see if it can load this partition */ for (i = 0; i < NUM_BOOT_MODULES; i++) { - if ((status = bs->AllocatePool(EfiLoaderData, + if ((status = BS->AllocatePool(EfiLoaderData, sizeof(*devinfo), (void **)&devinfo)) != EFI_SUCCESS) { DPRINTF("\nFailed to allocate devinfo (%lu)\n", @@ -513,7 +292,7 @@ probe_handle(EFI_HANDLE h, EFI_DEVICE_PATH *imgpath, B status = boot_modules[i]->probe(devinfo); if (status == EFI_SUCCESS) return (EFI_SUCCESS); - (void)bs->FreePool(devinfo); + (void)BS->FreePool(devinfo); } return (EFI_UNSUPPORTED); @@ -567,12 +346,13 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) UINTN i, max_dim, best_mode, cols, rows, hsize, nhandles; /* Basic initialization*/ - systab = Xsystab; - image = Ximage; - bs = Xsystab->BootServices; + ST = Xsystab; + IH = Ximage; + BS = ST->BootServices; + RS = ST->RuntimeServices; /* Set up the console, so printf works. */ - status = bs->LocateProtocol(&ConsoleControlGUID, NULL, + status = BS->LocateProtocol(&ConsoleControlGUID, NULL, (VOID **)&ConsoleControl); if (status == EFI_SUCCESS) (void)ConsoleControl->SetMode(ConsoleControl, @@ -580,7 +360,7 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) /* * Reset the console and find the best text mode. */ - conout = systab->ConOut; + conout = ST->ConOut; conout->Reset(conout, TRUE); max_dim = best_mode = 0; for (i = 0; ; i++) { @@ -609,24 +389,24 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) /* Get all the device handles */ hsize = (UINTN)NUM_HANDLES_INIT * sizeof(EFI_HANDLE); - if ((status = bs->AllocatePool(EfiLoaderData, hsize, (void **)&handles)) + if ((status = BS->AllocatePool(EfiLoaderData, hsize, (void **)&handles)) != EFI_SUCCESS) panic("Failed to allocate %d handles (%lu)", NUM_HANDLES_INIT, EFI_ERROR_CODE(status)); - status = bs->LocateHandle(ByProtocol, &BlockIoProtocolGUID, NULL, + status = BS->LocateHandle(ByProtocol, &BlockIoProtocolGUID, NULL, &hsize, handles); switch (status) { case EFI_SUCCESS: break; case EFI_BUFFER_TOO_SMALL: - (void)bs->FreePool(handles); - if ((status = bs->AllocatePool(EfiLoaderData, hsize, + (void)BS->FreePool(handles); + if ((status = BS->AllocatePool(EfiLoaderData, hsize, (void **)&handles)) != EFI_SUCCESS) { panic("Failed to allocate %zu handles (%lu)", hsize / sizeof(*handles), EFI_ERROR_CODE(status)); } - status = bs->LocateHandle(ByProtocol, &BlockIoProtocolGUID, + status = BS->LocateHandle(ByProtocol, &BlockIoProtocolGUID, NULL, &hsize, handles); if (status != EFI_SUCCESS) panic("Failed to get device handles (%lu)\n", @@ -643,15 +423,21 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) DPRINTF("\n"); /* Determine the devpath of our image so we can prefer it. */ - status = bs->HandleProtocol(image, &LoadedImageGUID, (VOID**)&img); + status = BS->HandleProtocol(IH, &LoadedImageGUID, (VOID**)&img); imgpath = NULL; if (status == EFI_SUCCESS) { - status = bs->HandleProtocol(img->DeviceHandle, &DevicePathGUID, + status = BS->HandleProtocol(img->DeviceHandle, &DevicePathGUID, (void **)&imgpath); if (status != EFI_SUCCESS) DPRINTF("Failed to get image DevicePath (%lu)\n", EFI_ERROR_CODE(status)); - DPRINTF("boot1 imagepath: %s\n", devpath_str(imgpath)); +#ifdef EFI_DEBUG + { + CHAR16 *text = efi_devpath_name(imgpath); + DPRINTF("boot1 imagepath: %S\n", text); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Wed Aug 30 21:18:45 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24BB6E0A5BC for ; Wed, 30 Aug 2017 21:18:45 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C27A8804FF; Wed, 30 Aug 2017 21:18:44 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7ULIhQw035690; Wed, 30 Aug 2017 21:18:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ULIhCL035682; Wed, 30 Aug 2017 21:18:43 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708302118.v7ULIhCL035682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 30 Aug 2017 21:18:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323033 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/acl/cifs tests/acl/nontrivial tests/acl/trivial tests/atime tests/bootfs tests/cache tests/cachefile tests/clean_mirror... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/acl/cifs tests/acl/nontrivial tests/acl/trivial tests/atime tests/bootfs tests/cache tests/cachefile tests/clean_mirror/assertion_001 tests/clea... X-SVN-Commit-Revision: 323033 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 21:18:45 -0000 Author: asomers Date: Wed Aug 30 21:18:43 2017 New Revision: 323033 URL: https://svnweb.freebsd.org/changeset/base/323033 Log: Reduce code duplication in the ZFS tests tests/sys/cddl/zfs/include/default.cfg.in tests/sys/cddl/zfs/tests/**/*_test.sh Define TESTCASE_ID in default.cfg instead of in every single test case. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh 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/clean_mirror/assertion_001/assertion_001_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_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_create/zfs_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_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_inherit/zfs_inherit_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_property/zfs_property_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_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_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_attach/zpool_attach_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_destroy/zpool_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_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_get/zpool_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh 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_offline/zpool_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_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_root/zpool_status/zpool_status_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_unallow/zfs_unallow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_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/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/interop/interop_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/large_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy_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_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/rebooting/rebooting_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/remote/sharing/sharing_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rename_dirs/rename_dirs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_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/sparse/sparse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/threadsappend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/userquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_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 projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/zones_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/default.cfg.in Wed Aug 30 21:18:43 2017 (r323033) @@ -38,6 +38,8 @@ export STF_SUITE=%%STFSUITEDIR%% # Turn ATF variables into environment variables export DISKS=`atf_config_get disks ""` export KEEP=`atf_config_get keep_pools "" | ${SED} -E 's/ +/|/g'` +export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") + . $STF_SUITE/include/constants.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -33,7 +33,6 @@ cifs_attr_001_pos_head() } cifs_attr_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -43,7 +42,6 @@ cifs_attr_001_pos_body() } cifs_attr_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -61,7 +59,6 @@ cifs_attr_002_pos_head() } cifs_attr_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -71,7 +68,6 @@ cifs_attr_002_pos_body() } cifs_attr_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -89,7 +85,6 @@ cifs_attr_003_pos_head() } cifs_attr_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg @@ -99,7 +94,6 @@ cifs_attr_003_pos_body() } cifs_attr_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/cifs.kshlib . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ zfs_acl_chmod_001_neg_head() } zfs_acl_chmod_001_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -41,7 +40,6 @@ zfs_acl_chmod_001_neg_body() } zfs_acl_chmod_001_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -58,7 +56,6 @@ zfs_acl_chmod_002_pos_head() } zfs_acl_chmod_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -67,7 +64,6 @@ zfs_acl_chmod_002_pos_body() } zfs_acl_chmod_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -84,7 +80,6 @@ zfs_acl_chmod_aclmode_001_pos_head() } zfs_acl_chmod_aclmode_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -93,7 +88,6 @@ zfs_acl_chmod_aclmode_001_pos_body() } zfs_acl_chmod_aclmode_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -109,7 +103,6 @@ zfs_acl_chmod_compact_001_pos_head() } zfs_acl_chmod_compact_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -118,7 +111,6 @@ zfs_acl_chmod_compact_001_pos_body() } zfs_acl_chmod_compact_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -134,7 +126,6 @@ zfs_acl_chmod_delete_001_pos_head() } zfs_acl_chmod_delete_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -143,7 +134,6 @@ zfs_acl_chmod_delete_001_pos_body() } zfs_acl_chmod_delete_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -159,7 +149,6 @@ zfs_acl_chmod_inherit_001_pos_head() } zfs_acl_chmod_inherit_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -168,7 +157,6 @@ zfs_acl_chmod_inherit_001_pos_body() } zfs_acl_chmod_inherit_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -185,7 +173,6 @@ zfs_acl_chmod_inherit_002_pos_head() } zfs_acl_chmod_inherit_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -194,7 +181,6 @@ zfs_acl_chmod_inherit_002_pos_body() } zfs_acl_chmod_inherit_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -211,7 +197,6 @@ zfs_acl_chmod_inherit_003_pos_head() } zfs_acl_chmod_inherit_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -220,7 +205,6 @@ zfs_acl_chmod_inherit_003_pos_body() } zfs_acl_chmod_inherit_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -237,7 +221,6 @@ zfs_acl_chmod_inherit_004_pos_head() } zfs_acl_chmod_inherit_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -246,7 +229,6 @@ zfs_acl_chmod_inherit_004_pos_body() } zfs_acl_chmod_inherit_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -262,7 +244,6 @@ zfs_acl_chmod_owner_001_pos_head() } zfs_acl_chmod_owner_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -271,7 +252,6 @@ zfs_acl_chmod_owner_001_pos_body() } zfs_acl_chmod_owner_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -287,7 +267,6 @@ zfs_acl_chmod_rwacl_001_pos_head() } zfs_acl_chmod_rwacl_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -296,7 +275,6 @@ zfs_acl_chmod_rwacl_001_pos_body() } zfs_acl_chmod_rwacl_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -312,7 +290,6 @@ zfs_acl_chmod_rwx_001_pos_head() } zfs_acl_chmod_rwx_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -321,7 +298,6 @@ zfs_acl_chmod_rwx_001_pos_body() } zfs_acl_chmod_rwx_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -337,7 +313,6 @@ zfs_acl_chmod_rwx_002_pos_head() } zfs_acl_chmod_rwx_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -346,7 +321,6 @@ zfs_acl_chmod_rwx_002_pos_body() } zfs_acl_chmod_rwx_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -362,7 +336,6 @@ zfs_acl_chmod_rwx_003_pos_head() } zfs_acl_chmod_rwx_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -371,7 +344,6 @@ zfs_acl_chmod_rwx_003_pos_body() } zfs_acl_chmod_rwx_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -387,7 +359,6 @@ zfs_acl_chmod_rwx_004_pos_head() } zfs_acl_chmod_rwx_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -396,7 +367,6 @@ zfs_acl_chmod_rwx_004_pos_body() } zfs_acl_chmod_rwx_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -413,7 +383,6 @@ zfs_acl_chmod_xattr_001_pos_head() } zfs_acl_chmod_xattr_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -422,7 +391,6 @@ zfs_acl_chmod_xattr_001_pos_body() } zfs_acl_chmod_xattr_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -439,7 +407,6 @@ zfs_acl_chmod_xattr_002_pos_head() } zfs_acl_chmod_xattr_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -448,7 +415,6 @@ zfs_acl_chmod_xattr_002_pos_body() } zfs_acl_chmod_xattr_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -465,7 +431,6 @@ zfs_acl_cp_001_pos_head() } zfs_acl_cp_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -474,7 +439,6 @@ zfs_acl_cp_001_pos_body() } zfs_acl_cp_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -491,7 +455,6 @@ zfs_acl_cp_002_pos_head() } zfs_acl_cp_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -500,7 +463,6 @@ zfs_acl_cp_002_pos_body() } zfs_acl_cp_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -517,7 +479,6 @@ zfs_acl_cpio_001_pos_head() } zfs_acl_cpio_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -526,7 +487,6 @@ zfs_acl_cpio_001_pos_body() } zfs_acl_cpio_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -543,7 +503,6 @@ zfs_acl_cpio_002_pos_head() } zfs_acl_cpio_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -552,7 +511,6 @@ zfs_acl_cpio_002_pos_body() } zfs_acl_cpio_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -568,7 +526,6 @@ zfs_acl_find_001_pos_head() } zfs_acl_find_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -577,7 +534,6 @@ zfs_acl_find_001_pos_body() } zfs_acl_find_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -593,7 +549,6 @@ zfs_acl_ls_001_pos_head() } zfs_acl_ls_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -602,7 +557,6 @@ zfs_acl_ls_001_pos_body() } zfs_acl_ls_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -618,7 +572,6 @@ zfs_acl_mv_001_pos_head() } zfs_acl_mv_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -627,7 +580,6 @@ zfs_acl_mv_001_pos_body() } zfs_acl_mv_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -644,7 +596,6 @@ zfs_acl_tar_001_pos_head() } zfs_acl_tar_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -653,7 +604,6 @@ zfs_acl_tar_001_pos_body() } zfs_acl_tar_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -670,7 +620,6 @@ zfs_acl_tar_002_pos_head() } zfs_acl_tar_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -679,7 +628,6 @@ zfs_acl_tar_002_pos_body() } zfs_acl_tar_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -31,7 +31,6 @@ zfs_acl_chmod_001_pos_head() } zfs_acl_chmod_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -40,7 +39,6 @@ zfs_acl_chmod_001_pos_body() } zfs_acl_chmod_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -56,7 +54,6 @@ zfs_acl_compress_001_pos_head() } zfs_acl_compress_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -65,7 +62,6 @@ zfs_acl_compress_001_pos_body() } zfs_acl_compress_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -81,7 +77,6 @@ zfs_acl_cp_001_pos_head() } zfs_acl_cp_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -90,7 +85,6 @@ zfs_acl_cp_001_pos_body() } zfs_acl_cp_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -106,7 +100,6 @@ zfs_acl_cp_002_neg_head() } zfs_acl_cp_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -115,7 +108,6 @@ zfs_acl_cp_002_neg_body() } zfs_acl_cp_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -132,7 +124,6 @@ zfs_acl_cp_003_neg_head() } zfs_acl_cp_003_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -141,7 +132,6 @@ zfs_acl_cp_003_neg_body() } zfs_acl_cp_003_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -157,7 +147,6 @@ zfs_acl_find_001_pos_head() } zfs_acl_find_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -166,7 +155,6 @@ zfs_acl_find_001_pos_body() } zfs_acl_find_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -183,7 +171,6 @@ zfs_acl_find_002_neg_head() } zfs_acl_find_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -192,7 +179,6 @@ zfs_acl_find_002_neg_body() } zfs_acl_find_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -208,7 +194,6 @@ zfs_acl_ls_001_pos_head() } zfs_acl_ls_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -217,7 +202,6 @@ zfs_acl_ls_001_pos_body() } zfs_acl_ls_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -234,7 +218,6 @@ zfs_acl_ls_002_neg_head() } zfs_acl_ls_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -243,7 +226,6 @@ zfs_acl_ls_002_neg_body() } zfs_acl_ls_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -259,7 +241,6 @@ zfs_acl_mv_001_pos_head() } zfs_acl_mv_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -268,7 +249,6 @@ zfs_acl_mv_001_pos_body() } zfs_acl_mv_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -285,7 +265,6 @@ zfs_acl_pack_001_pos_head() } zfs_acl_pack_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -294,7 +273,6 @@ zfs_acl_pack_001_pos_body() } zfs_acl_pack_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -311,7 +289,6 @@ zfs_acl_pax_001_pos_head() } zfs_acl_pax_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -320,7 +297,6 @@ zfs_acl_pax_001_pos_body() } zfs_acl_pax_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -337,7 +313,6 @@ zfs_acl_pax_002_pos_head() } zfs_acl_pax_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -346,7 +321,6 @@ zfs_acl_pax_002_pos_body() } zfs_acl_pax_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -363,7 +337,6 @@ zfs_acl_pax_003_pos_head() } zfs_acl_pax_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -372,7 +345,6 @@ zfs_acl_pax_003_pos_body() } zfs_acl_pax_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -389,7 +361,6 @@ zfs_acl_pax_004_pos_head() } zfs_acl_pax_004_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -398,7 +369,6 @@ zfs_acl_pax_004_pos_body() } zfs_acl_pax_004_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -415,7 +385,6 @@ zfs_acl_pax_005_pos_head() } zfs_acl_pax_005_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -424,7 +393,6 @@ zfs_acl_pax_005_pos_body() } zfs_acl_pax_005_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -441,7 +409,6 @@ zfs_acl_pax_006_pos_head() } zfs_acl_pax_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -450,7 +417,6 @@ zfs_acl_pax_006_pos_body() } zfs_acl_pax_006_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -466,7 +432,6 @@ zfs_acl_tar_001_pos_head() } zfs_acl_tar_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -475,7 +440,6 @@ zfs_acl_tar_001_pos_body() } zfs_acl_tar_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -491,7 +455,6 @@ zfs_acl_tar_002_neg_head() } zfs_acl_tar_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg @@ -500,7 +463,6 @@ zfs_acl_tar_002_neg_body() } zfs_acl_tar_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/../acl.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Wed Aug 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ atime_001_pos_head() } atime_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -42,7 +41,6 @@ atime_001_pos_body() } atime_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -59,7 +57,6 @@ atime_002_neg_head() } atime_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg @@ -69,7 +66,6 @@ atime_002_neg_body() } atime_002_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/atime_common.kshlib . $(atf_get_srcdir)/atime.cfg 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 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -32,7 +32,6 @@ bootfs_001_pos_head() } bootfs_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -48,7 +47,6 @@ bootfs_002_neg_head() } bootfs_002_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -64,7 +62,6 @@ bootfs_003_pos_head() } bootfs_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -80,7 +77,6 @@ bootfs_004_neg_head() } bootfs_004_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -96,7 +92,6 @@ bootfs_005_neg_head() } bootfs_005_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -112,7 +107,6 @@ bootfs_006_pos_head() } bootfs_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -128,7 +122,6 @@ bootfs_007_pos_head() } bootfs_007_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -144,7 +137,6 @@ bootfs_008_neg_head() } bootfs_008_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg @@ -161,7 +153,6 @@ bootfs_009_neg_head() } bootfs_009_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/bootfs.cfg 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 30 21:16:32 2017 (r323032) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 30 21:18:43 2017 (r323033) @@ -33,7 +33,6 @@ cache_001_pos_head() } cache_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -43,7 +42,6 @@ cache_001_pos_body() } cache_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -61,7 +59,6 @@ cache_002_pos_head() } cache_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -71,7 +68,6 @@ cache_002_pos_body() } cache_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -89,7 +85,6 @@ cache_003_pos_head() } cache_003_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -99,7 +94,6 @@ cache_003_pos_body() } cache_003_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -117,7 +111,6 @@ cache_004_neg_head() } cache_004_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -127,7 +120,6 @@ cache_004_neg_body() } cache_004_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -145,7 +137,6 @@ cache_005_neg_head() } cache_005_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -155,7 +146,6 @@ cache_005_neg_body() } cache_005_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -173,7 +163,6 @@ cache_006_pos_head() } cache_006_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -183,7 +172,6 @@ cache_006_pos_body() } cache_006_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -201,7 +189,6 @@ cache_007_neg_head() } cache_007_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg @@ -211,7 +198,6 @@ cache_007_neg_body() *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Wed Aug 30 21:37:18 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F1F1E0AB70 for ; Wed, 30 Aug 2017 21:37:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F3F08116B; Wed, 30 Aug 2017 21:37:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7ULbHgl043793; Wed, 30 Aug 2017 21:37:17 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ULbGf7043785; Wed, 30 Aug 2017 21:37:16 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708302137.v7ULbGf7043785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 30 Aug 2017 21:37:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323035 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_destroy cli_root/zfs_diff cli_root/zfs_unmount cli_root/zpool_expand cli_root/zpool_upgrade cli_user/misc utils_te... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_destroy cli_root/zfs_diff cli_root/zfs_unmount cli_root/zpool_expand cli_root/zpool_upgrade cli_user/misc utils_test zil X-SVN-Commit-Revision: 323035 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 21:37:18 -0000 Author: asomers Date: Wed Aug 30 21:37:16 2017 New Revision: 323035 URL: https://svnweb.freebsd.org/changeset/base/323035 Log: Add some missing diffs from r323033 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -138,7 +138,6 @@ zfs_destroy_005_neg_head() zfs_destroy_005_neg_body() { atf_fail "This test causes a panic on FreeBSD" - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_destroy_common.kshlib . $(atf_get_srcdir)/zfs_destroy.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -32,7 +32,6 @@ zfs_diff_001_pos_head() } zfs_diff_001_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") atf_expect_fail "PR221234 ZFS diff does not properly display files that have been moved to a new directory." . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_diff.cfg @@ -42,7 +41,6 @@ zfs_diff_001_pos_body() } zfs_diff_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_diff.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -233,7 +233,6 @@ zfs_unmount_009_pos_head() zfs_unmount_009_pos_body() { atf_fail "This test causes a panic on FreeBSD" - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_unmount.kshlib . $(atf_get_srcdir)/zfs_unmount.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -34,7 +34,6 @@ zpool_expand_001_pos_body() { atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg @@ -43,7 +42,6 @@ zpool_expand_001_pos_body() } zpool_expand_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg @@ -61,7 +59,6 @@ zpool_expand_002_pos_body() { atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg @@ -70,7 +67,6 @@ zpool_expand_002_pos_body() } zpool_expand_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg @@ -88,7 +84,6 @@ zpool_expand_003_neg_body() { atf_fail "This test causes a panic on FreeBSD" atf_expect_fail 'BUG26166 cannot create pools on zvols' - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg @@ -97,7 +92,6 @@ zpool_expand_003_neg_body() } zpool_expand_003_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -61,7 +61,6 @@ zpool_upgrade_002_pos_head() } zpool_upgrade_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg @@ -71,7 +70,6 @@ zpool_upgrade_002_pos_body() } zpool_upgrade_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg @@ -203,7 +201,6 @@ zpool_upgrade_007_pos_head() zpool_upgrade_007_pos_body() { atf_fail "This test causes a panic on FreeBSD" - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg @@ -213,7 +210,6 @@ zpool_upgrade_007_pos_body() } zpool_upgrade_007_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg 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 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -657,7 +657,6 @@ zpool_create_001_neg_head() } zpool_create_001_neg_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg @@ -666,7 +665,6 @@ zpool_create_001_neg_body() } zpool_create_001_neg_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" @@ -682,7 +680,6 @@ zpool_create_002_pos_head() } zpool_create_002_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg # No setup is required for this test. @@ -690,7 +687,6 @@ zpool_create_002_pos_body() } zpool_create_002_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../../include/default.cfg ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -184,7 +184,6 @@ utils_test_007_pos_head() } utils_test_007_pos_body() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/utils_test.kshlib . $(atf_get_srcdir)/utils_test.cfg @@ -194,7 +193,6 @@ utils_test_007_pos_body() } utils_test_007_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/utils_test.kshlib . $(atf_get_srcdir)/utils_test.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Wed Aug 30 21:18:56 2017 (r323034) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh Wed Aug 30 21:37:16 2017 (r323035) @@ -33,7 +33,6 @@ zil_001_pos_head() zil_001_pos_body() { atf_fail "This test causes a panic on FreeBSD" - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/zil.kshlib . $(atf_get_srcdir)/zil.cfg @@ -43,7 +42,6 @@ zil_001_pos_body() } zil_001_pos_cleanup() { - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/zil.kshlib . $(atf_get_srcdir)/zil.cfg From owner-svn-src-projects@freebsd.org Wed Aug 30 21:50:16 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEA23E0B2D2 for ; Wed, 30 Aug 2017 21:50:16 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62EB5819D9; Wed, 30 Aug 2017 21:50:16 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7ULoFeH048012; Wed, 30 Aug 2017 21:50:15 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ULoE7m047996; Wed, 30 Aug 2017 21:50:14 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708302150.v7ULoE7m047996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 30 Aug 2017 21:50:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323036 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zpool_attach tests/cli_root/zpool_destroy tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_ro... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zpool_attach tests/cli_root/zpool_destroy tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_root/zpool_offline tests/cl... X-SVN-Commit-Revision: 323036 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 21:50:16 -0000 Author: asomers Date: Wed Aug 30 21:50:13 2017 New Revision: 323036 URL: https://svnweb.freebsd.org/changeset/base/323036 Log: Remove "at_least_X_disks" kyua config variables in the ZFS test suite tests/sys/cddl/zfs/include/libtest.kshlib verify_disk_count should skip the remainder of the test on failure. tests/sys/cddl/zfs/tests/**/*_test.sh Replace ATF "require.config at_least_X_disk" statements in test case heads with "verify_disk_count" statements in test case bodies. tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh Remove a redundant verify_disk_count statement Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh 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_offline/zpool_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_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_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 21:50:13 2017 (r323036) @@ -3070,7 +3070,7 @@ function verify_disk_count typeset -i count=$(get_word_count "$1") if (( count < min )); then - log_untested "A minimum of $min disks is required to run." \ + atf_skip "A minimum of $min disks is required to run." \ " You specified $count disk(s)" fi } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_attach_001_neg cleanup zpool_attach_001_neg_head() { atf_set "descr" "Executing 'zpool attach' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_attach_001_neg_body() @@ -36,6 +35,7 @@ zpool_attach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_attach.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -97,7 +97,6 @@ zpool_destroy_004_pos_head() { atf_set "descr" "'zpool destroy -f' should work on active pools." atf_set "require.progs" zfs zpool - atf_set "require.config" at_least_2_disks atf_set "timeout" 2000 } zpool_destroy_004_pos_body() @@ -105,6 +104,7 @@ zpool_destroy_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_destroy.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/zpool_destroy_004_pos.ksh || atf_fail "Testcase failed" } zpool_destroy_004_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_detach_001_neg cleanup zpool_detach_001_neg_head() { atf_set "descr" "Executing 'zpool detach' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_detach_001_neg_body() @@ -36,6 +35,7 @@ zpool_detach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_detach.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh || atf_fail "Testcase failed" } 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 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_import_002_pos cleanup 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 zdb atf_set "timeout" 2400 } @@ -37,6 +36,7 @@ zpool_import_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_002_pos.ksh || atf_fail "Testcase failed" } @@ -53,7 +53,6 @@ atf_test_case zpool_import_003_pos cleanup 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" zpool zfs atf_set "timeout" 2400 } @@ -62,6 +61,7 @@ zpool_import_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_003_pos.ksh || atf_fail "Testcase failed" } @@ -78,7 +78,6 @@ atf_test_case zpool_import_004_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -87,6 +86,7 @@ zpool_import_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_004_pos.ksh || atf_fail "Testcase failed" } @@ -103,7 +103,6 @@ atf_test_case zpool_import_005_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -112,6 +111,7 @@ zpool_import_005_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_005_pos.ksh || atf_fail "Testcase failed" } @@ -128,7 +128,6 @@ atf_test_case zpool_import_006_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -137,6 +136,7 @@ zpool_import_006_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_006_pos.ksh || atf_fail "Testcase failed" } @@ -153,7 +153,6 @@ atf_test_case zpool_import_007_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -162,6 +161,7 @@ zpool_import_007_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_007_pos.ksh || atf_fail "Testcase failed" } @@ -178,7 +178,6 @@ atf_test_case zpool_import_008_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -187,6 +186,7 @@ zpool_import_008_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_008_pos.ksh || atf_fail "Testcase failed" } @@ -203,7 +203,6 @@ atf_test_case zpool_import_009_neg cleanup 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 atf_set "timeout" 2400 } @@ -212,6 +211,7 @@ zpool_import_009_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_009_neg.ksh || atf_fail "Testcase failed" } @@ -228,7 +228,6 @@ atf_test_case zpool_import_010_pos cleanup 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" zpool zfs atf_set "timeout" 2400 } @@ -237,6 +236,7 @@ zpool_import_010_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_010_pos.ksh || atf_fail "Testcase failed" } @@ -253,7 +253,6 @@ atf_test_case zpool_import_011_neg cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -262,6 +261,7 @@ zpool_import_011_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_011_neg.ksh || atf_fail "Testcase failed" } @@ -278,7 +278,6 @@ atf_test_case zpool_import_012_pos cleanup 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 zdb share atf_set "timeout" 2400 } @@ -287,6 +286,7 @@ zpool_import_012_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_012_pos.ksh || atf_fail "Testcase failed" } @@ -303,7 +303,6 @@ atf_test_case zpool_import_013_neg cleanup 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 atf_set "timeout" 2400 } @@ -313,6 +312,7 @@ zpool_import_013_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_013_neg.ksh || atf_fail "Testcase failed" } @@ -329,7 +329,6 @@ atf_test_case zpool_import_014_pos cleanup zpool_import_014_pos_head() { atf_set "descr" "'zpool import' can import destroyed disk-backed pools" - atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool } zpool_import_014_pos_body() @@ -337,6 +336,7 @@ zpool_import_014_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_import_014_pos.ksh || atf_fail "Testcase failed" } zpool_import_014_pos_cleanup() @@ -352,7 +352,6 @@ atf_test_case zpool_import_all_001_pos cleanup 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 atf_set "timeout" 2400 } @@ -362,6 +361,7 @@ zpool_import_all_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_all_001_pos.ksh || atf_fail "Testcase failed" } @@ -378,7 +378,6 @@ atf_test_case zpool_import_missing_001_pos cleanup 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" zfs sum zpool zdb atf_set "timeout" 2400 } @@ -387,6 +386,7 @@ zpool_import_missing_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_001_pos.ksh || atf_fail "Testcase failed" } @@ -403,7 +403,6 @@ atf_test_case zpool_import_missing_002_pos cleanup 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" zpool zfs zdb atf_set "timeout" 2400 } @@ -412,6 +411,7 @@ zpool_import_missing_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_002_pos.ksh || atf_fail "Testcase failed" } @@ -428,7 +428,6 @@ atf_test_case zpool_import_missing_003_pos cleanup 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" zpool sum zfs atf_set "timeout" 2400 } @@ -437,6 +436,7 @@ zpool_import_missing_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_003_pos.ksh || atf_fail "Testcase failed" } @@ -483,7 +483,6 @@ atf_test_case zpool_import_rename_001_pos cleanup 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 zdb atf_set "timeout" 2400 } @@ -492,6 +491,7 @@ zpool_import_rename_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_rename_001_pos.ksh || atf_fail "Testcase failed" } @@ -507,7 +507,6 @@ atf_test_case zpool_import_corrupt_001_pos cleanup zpool_import_corrupt_001_pos_head() { atf_set "descr" "Verify that a disk-backed exported pool with some of its vdev labels corrupted can still be imported" - atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 2400 } @@ -516,6 +515,7 @@ zpool_import_corrupt_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_import_corrupt_001_pos.ksh || atf_fail "Testcase failed" } zpool_import_corrupt_001_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_offline_001_pos cleanup zpool_offline_001_pos_head() { atf_set "descr" "Executing 'zpool offline' with correct options succeeds" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_offline_001_pos_body() @@ -36,6 +35,7 @@ zpool_offline_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_offline_001_pos.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_offline_002_neg cleanup zpool_offline_002_neg_head() { atf_set "descr" "Executing 'zpool offline' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_offline_002_neg_body() @@ -60,6 +59,7 @@ zpool_offline_002_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_offline_002_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_online_001_pos cleanup zpool_online_001_pos_head() { atf_set "descr" "Executing 'zpool online' with correct options succeeds" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_online_001_pos_body() @@ -36,6 +35,7 @@ zpool_online_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_online.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_online_001_pos.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_online_002_neg cleanup zpool_online_002_neg_head() { atf_set "descr" "Executing 'zpool online' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_online_002_neg_body() @@ -60,6 +59,7 @@ zpool_online_002_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_online.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_online_002_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_replace_001_neg cleanup zpool_replace_001_neg_head() { atf_set "descr" "Executing 'zpool replace' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_replace_001_neg_body() @@ -36,6 +35,7 @@ zpool_replace_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_replace.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh || atf_fail "Testcase failed" } 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 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_scrub_001_neg cleanup 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" zpool } zpool_scrub_001_neg_body() @@ -36,6 +35,7 @@ zpool_scrub_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_scrub_002_pos cleanup 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" zpool } zpool_scrub_002_pos_body() @@ -60,6 +59,7 @@ zpool_scrub_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_002_pos.ksh || atf_fail "Testcase failed" } @@ -76,7 +76,6 @@ atf_test_case zpool_scrub_003_pos cleanup 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" zpool } zpool_scrub_003_pos_body() @@ -84,6 +83,7 @@ zpool_scrub_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_003_pos.ksh || atf_fail "Testcase failed" } @@ -100,7 +100,6 @@ atf_test_case zpool_scrub_004_pos cleanup 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" zpool } zpool_scrub_004_pos_body() @@ -108,6 +107,7 @@ zpool_scrub_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_004_pos.ksh || atf_fail "Testcase failed" } @@ -124,7 +124,6 @@ atf_test_case zpool_scrub_005_pos cleanup 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" zpool } zpool_scrub_005_pos_body() @@ -132,6 +131,7 @@ zpool_scrub_005_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_005_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_upgrade_001_pos cleanup zpool_upgrade_001_pos_head() { atf_set "descr" "Executing 'zpool upgrade -v' command succeeds." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -38,6 +37,7 @@ zpool_upgrade_001_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_001_pos.ksh || atf_fail "Testcase failed" } @@ -55,7 +55,6 @@ atf_test_case zpool_upgrade_002_pos cleanup zpool_upgrade_002_pos_head() { atf_set "descr" "Import pools of all versions - zpool upgrade on each pools works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -65,6 +64,7 @@ zpool_upgrade_002_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_002_pos.ksh || atf_fail "Testcase failed" } @@ -82,7 +82,6 @@ atf_test_case zpool_upgrade_003_pos cleanup zpool_upgrade_003_pos_head() { atf_set "descr" "Upgrading a pool that has already been upgraded succeeds." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -92,6 +91,7 @@ zpool_upgrade_003_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_003_pos.ksh || atf_fail "Testcase failed" } @@ -109,7 +109,6 @@ atf_test_case zpool_upgrade_004_pos cleanup zpool_upgrade_004_pos_head() { atf_set "descr" "zpool upgrade -a works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -119,6 +118,7 @@ zpool_upgrade_004_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 [[ -n "$KEEP" ]] && \ atf_skip "Can't test unmount -a when pools are in KEEP" @@ -139,7 +139,6 @@ atf_test_case zpool_upgrade_005_neg cleanup zpool_upgrade_005_neg_head() { atf_set "descr" "Variations of upgrade -v print usage message,return with non-zero status" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -149,6 +148,7 @@ zpool_upgrade_005_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_005_neg.ksh || atf_fail "Testcase failed" } @@ -166,7 +166,6 @@ atf_test_case zpool_upgrade_006_neg cleanup zpool_upgrade_006_neg_head() { atf_set "descr" "Attempting to upgrade a non-existent pool will return an error" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -176,6 +175,7 @@ zpool_upgrade_006_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_006_neg.ksh || atf_fail "Testcase failed" } @@ -193,7 +193,6 @@ atf_test_case zpool_upgrade_007_pos cleanup zpool_upgrade_007_pos_head() { atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool # This test can take quite a while, especially on debug bits. atf_set "timeout" 7200 @@ -205,6 +204,7 @@ zpool_upgrade_007_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_007_pos.ksh || atf_fail "Testcase failed" } @@ -222,7 +222,6 @@ atf_test_case zpool_upgrade_008_pos cleanup zpool_upgrade_008_pos_head() { atf_set "descr" "Zpool upgrade should be able to upgrade pools to a given version using -V" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -232,6 +231,7 @@ zpool_upgrade_008_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_008_pos.ksh || atf_fail "Testcase failed" } @@ -249,7 +249,6 @@ atf_test_case zpool_upgrade_009_neg cleanup zpool_upgrade_009_neg_head() { atf_set "descr" "Zpool upgrade -V shouldn't be able to upgrade a pool to an unknown version" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -259,6 +258,7 @@ zpool_upgrade_009_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_009_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -603,7 +603,6 @@ hotspare_replace_003_neg_head() { atf_set "descr" "'zpool replace' of disabled hotspares should result in ignoring them after destroy." atf_set "require.progs" camcontrol zpool - atf_set "require.config" at_least_5_disks atf_set "timeout" 3600 } hotspare_replace_003_neg_body() @@ -613,6 +612,7 @@ hotspare_replace_003_neg_body() . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/hotspare_replace_003_neg.ksh || atf_fail "Testcase failed" } @@ -681,7 +681,6 @@ atf_test_case hotspare_shared_001_pos cleanup hotspare_shared_001_pos_head() { atf_set "descr" "'zpool add spare ...' can add a disk as a shared spare to multiple pools." - atf_set "require.config" at_least_5_disks atf_set "require.progs" zpool atf_set "timeout" 3600 } @@ -691,6 +690,7 @@ hotspare_shared_001_pos_body() . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/hotspare_shared_001_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case online_offline_001_pos cleanup online_offline_001_pos_head() { atf_set "descr" "Turning a disk offline and back online during I/O completes." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zdb atf_set "timeout" 3600 } @@ -37,6 +36,7 @@ online_offline_001_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/online_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/online_offline_001_pos.ksh || atf_fail "Testcase failed" } online_offline_001_pos_cleanup() @@ -52,7 +52,6 @@ atf_test_case online_offline_002_neg cleanup online_offline_002_neg_head() { atf_set "descr" "Offlining a disk should fail if the pool would go critical" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zdb atf_set "timeout" 3600 } @@ -61,6 +60,7 @@ online_offline_002_neg_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/online_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/online_offline_002_neg.ksh || atf_fail "Testcase failed" } online_offline_002_neg_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,13 +28,13 @@ atf_test_case poolversion_001_pos cleanup poolversion_001_pos_head() { atf_set "descr" "zpool set version can upgrade a pool" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } poolversion_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/poolversion_001_pos.ksh || atf_fail "Testcase failed" } @@ -50,13 +50,13 @@ atf_test_case poolversion_002_pos cleanup poolversion_002_pos_head() { atf_set "descr" "zpool set version can only increment pool version" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } poolversion_002_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/poolversion_002_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case replacement_001_pos cleanup replacement_001_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_3_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -36,6 +35,7 @@ replacement_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 3 ksh93 $(atf_get_srcdir)/replacement_001_pos.ksh || atf_fail "Testcase failed" } replacement_001_pos_cleanup() @@ -50,7 +50,6 @@ atf_test_case replacement_002_pos cleanup replacement_002_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_3_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -58,6 +57,7 @@ replacement_002_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 3 ksh93 $(atf_get_srcdir)/replacement_002_pos.ksh || atf_fail "Testcase failed" } replacement_002_pos_cleanup() @@ -72,7 +72,6 @@ atf_test_case replacement_003_pos cleanup replacement_003_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -80,6 +79,7 @@ replacement_003_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/replacement_003_pos.ksh || atf_fail "Testcase failed" } replacement_003_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case rsend_001_pos cleanup rsend_001_pos_head() { atf_set "descr" "zfs send -R send replication stream up to the named snap." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -38,6 +37,7 @@ rsend_001_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_001_pos.ksh || atf_fail "Testcase failed" } @@ -55,7 +55,6 @@ atf_test_case rsend_002_pos cleanup rsend_002_pos_head() { atf_set "descr" "zfs send -I sends all incrementals from fs@init to fs@final." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -65,6 +64,7 @@ rsend_002_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_002_pos.ksh || atf_fail "Testcase failed" } @@ -82,7 +82,6 @@ atf_test_case rsend_003_pos cleanup rsend_003_pos_head() { atf_set "descr" "zfs send -I send all incrementals from dataset@init to clone@snap" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -92,6 +91,7 @@ rsend_003_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_003_pos.ksh || atf_fail "Testcase failed" } @@ -109,7 +109,6 @@ atf_test_case rsend_004_pos cleanup rsend_004_pos_head() { atf_set "descr" "zfs send -R -i send incremental from fs@init to fs@final." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -119,6 +118,7 @@ rsend_004_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_004_pos.ksh || atf_fail "Testcase failed" } @@ -136,7 +136,6 @@ atf_test_case rsend_005_pos cleanup rsend_005_pos_head() { atf_set "descr" "zfs send -R -I send all the incremental between @init with @final" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -146,6 +145,7 @@ rsend_005_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_005_pos.ksh || atf_fail "Testcase failed" } @@ -163,7 +163,6 @@ atf_test_case rsend_006_pos cleanup rsend_006_pos_head() { atf_set "descr" "Rename snapshot name will not change the dependent order." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -173,6 +172,7 @@ rsend_006_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_006_pos.ksh || atf_fail "Testcase failed" } @@ -190,7 +190,6 @@ atf_test_case rsend_007_pos cleanup rsend_007_pos_head() { atf_set "descr" "Rename parent filesystem name will not change the dependent order." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -200,6 +199,7 @@ rsend_007_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_007_pos.ksh || atf_fail "Testcase failed" } @@ -217,7 +217,6 @@ atf_test_case rsend_008_pos cleanup rsend_008_pos_head() { atf_set "descr" "Changes made by 'zfs promote' can be properly received." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -227,6 +226,7 @@ rsend_008_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_008_pos.ksh || atf_fail "Testcase failed" } @@ -244,7 +244,6 @@ atf_test_case rsend_009_pos cleanup rsend_009_pos_head() { atf_set "descr" "Verify zfs receive can handle out of space correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs atf_set "timeout" 2700 } @@ -254,6 +253,7 @@ rsend_009_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_009_pos.ksh || atf_fail "Testcase failed" } @@ -271,7 +271,6 @@ atf_test_case rsend_010_pos cleanup rsend_010_pos_head() { atf_set "descr" "ZFS can handle stream with multiple identical (same GUID) snapshots" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -281,6 +280,7 @@ rsend_010_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_010_pos.ksh || atf_fail "Testcase failed" } @@ -298,7 +298,6 @@ atf_test_case rsend_011_pos cleanup rsend_011_pos_head() { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Wed Aug 30 22:02:38 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1631DE0B81E for ; Wed, 30 Aug 2017 22:02:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D33C282344; Wed, 30 Aug 2017 22:02:37 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7UM2bOw055869; Wed, 30 Aug 2017 22:02:37 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UM2YTR055840; Wed, 30 Aug 2017 22:02:34 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708302202.v7UM2YTR055840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 30 Aug 2017 22:02:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323037 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/cli_root/zpool_attach tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_root/zpool_offline ... X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/cli_root/zpool_attach tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_root/zpool_offline tests/cli_root/zpool_onli... X-SVN-Commit-Revision: 323037 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 22:02:38 -0000 Author: asomers Date: Wed Aug 30 22:02:34 2017 New Revision: 323037 URL: https://svnweb.freebsd.org/changeset/base/323037 Log: More consistency in the ZFS test suite. Move all invocations of verify_disk_count into the top of the ATF test body. tests/sys/cddl/zfs/include/libtest.kshlib Fix the set_disks function when only one disk is available. Previously, its API differed depending on whether 1 or >1 disks were available. This didn't make sense, and all tests were developed with >1 disks. tests/sys/cddl/zfs/tests/**/*.ksh tests/sys/cddl/zfs/tests/**/*_test.sh Move many verify_disk_count invocations from individual test files into the ATF script. tests/sys/cddl/zfs/tests/cache/*.ksh Fix all these tests. They were using verify_disk_count in a useless way. tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh Make this test work more like the other cache tests. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 22:02:34 2017 (r323037) @@ -2014,26 +2014,16 @@ function set_disks set -A disk_array $(find_disks $DISKS) [[ -z "$DISK_ARRAY_LIMIT" ]] && typeset -i DISK_ARRAY_LIMIT=5 - if (( ${#disk_array[*]} <= 1 )); then - export DISK=${DISKS%% *} - export DISK_ARRAY_NUM=1 - else - export DISK="" - typeset -i i=0 - while (( i < ${#disk_array[*]} && i <= $DISK_ARRAY_LIMIT )); do - export DISK${i}="${disk_array[$i]}" - DISKSARRAY="$DISKSARRAY ${disk_array[$i]}" - (( i = i + 1 )) - done - export DISK_ARRAY_NUM=$i - export DISKSARRAY - fi - - if (( $DISK_ARRAY_NUM == 0 )); then - export disk=$DISK - else - export disk=$DISK0 - fi + export DISK="" + typeset -i i=0 + while (( i < ${#disk_array[*]} && i <= $DISK_ARRAY_LIMIT )); do + export DISK${i}="${disk_array[$i]}" + DISKSARRAY="$DISKSARRAY ${disk_array[$i]}" + (( i = i + 1 )) + done + export DISK_ARRAY_NUM=$i + export DISKSARRAY + export disk=$DISK0 } # Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -55,7 +55,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "Adding an extra cache device works." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -54,7 +54,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "Attaching a cache device fails." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -55,7 +55,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "Replacing a cache device fails." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -57,7 +57,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "Exporting and importing pool with cache devices passes." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -53,7 +53,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "A mirror/raidz/raidz2 cache is not supported." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -54,7 +54,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "A raidz/raidz2 cache can not be added to existed pool." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -55,7 +55,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" log_assert "Offline and online a cache device succeed." log_onexit cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -66,12 +66,11 @@ function cleanup_testenv log_assert "Cache device can only be disk or slice." log_onexit cleanup_testenv -dsk1=${DISKS%% *} -log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1} +log_must $ZPOOL create $TESTPOOL $VDEV # Add nomal disk -log_must $ZPOOL add $TESTPOOL cache $dsk1 -log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE' +log_must $ZPOOL add $TESTPOOL cache ${LDEV} +log_must verify_cache_device $TESTPOOL ${LDEV} 'ONLINE' # Add nomal file log_mustnot $ZPOOL add $TESTPOOL cache $VDEV2 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -54,7 +54,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$LDEV2" function cleanup { if datasetexists $TESTPOOL ; then 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 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 30 22:02:34 2017 (r323037) @@ -37,6 +37,7 @@ cache_001_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_001_pos.ksh || atf_fail "Testcase failed" } @@ -63,6 +64,7 @@ cache_002_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_002_pos.ksh || atf_fail "Testcase failed" } @@ -89,6 +91,7 @@ cache_003_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_003_pos.ksh || atf_fail "Testcase failed" } @@ -115,6 +118,7 @@ cache_004_neg_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_004_neg.ksh || atf_fail "Testcase failed" } @@ -141,6 +145,7 @@ cache_005_neg_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_005_neg.ksh || atf_fail "Testcase failed" } @@ -167,6 +172,7 @@ cache_006_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_006_pos.ksh || atf_fail "Testcase failed" } @@ -193,6 +199,7 @@ cache_007_neg_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_007_neg.ksh || atf_fail "Testcase failed" } @@ -219,6 +226,7 @@ cache_008_neg_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_008_neg.ksh || atf_fail "Testcase failed" } @@ -245,6 +253,7 @@ cache_009_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_009_pos.ksh || atf_fail "Testcase failed" } @@ -271,6 +280,7 @@ cache_010_neg_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_010_neg.ksh || atf_fail "Testcase failed" } @@ -297,6 +307,7 @@ cache_011_pos_body() . $(atf_get_srcdir)/cache.kshlib . $(atf_get_srcdir)/cache.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/cache_011_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 DISK=${DISKS%% *} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/include/libtest.kshlib verify_runnable "global" -verify_disk_count "$DISKS" 2 default_mirror_setup_noexit $DISK1 $DISK2 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -54,7 +54,6 @@ ################################################################################ verify_runnable "global" -verify_disk_count "$DISKS" 5 function cleanup { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -37,7 +37,6 @@ then log_unsupported "zpool version property not supported on this system." fi -verify_disk_count "$DISKS" 2 DISKS_ARRAY=($DISKS) # create a version 1 pool log_must $ZPOOL create -f -o version=1 $TESTPOOL ${DISKS_ARRAY[0]} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -30,7 +30,6 @@ . $STF_SUITE/tests/rsend/rsend.kshlib verify_runnable "both" -verify_disk_count "$DISKS" 2 # # Check if the system support 'send -R' Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -32,7 +32,6 @@ verify_runnable "global" echo "list of disks: $DISKS" -verify_disk_count "$DISKS" 2 # Make sure that all of the disks that we've been given are attached to a # SAS expander, and that we can find the phy they're attached to. This Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -62,7 +62,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 log_assert "A pool with the autoreplace property set will replace disks by physical path" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -62,8 +62,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 - log_assert "A pool with the autoreplace property will replace disks by physical path" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -64,8 +64,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 - log_assert "A pool with the autoreplace property will replace disks by physical path" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -55,7 +55,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 function cleanup { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -60,8 +60,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 - log_assert "Removing a disk from a pool results in the spare activating" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) @@ -60,8 +60,6 @@ ############################################################################### verify_runnable "global" -verify_disk_count "$DISKS" 5 - log_assert "zfsd will spare missing drives on startup" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Aug 30 21:50:13 2017 (r323036) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Aug 30 22:02:34 2017 (r323037) @@ -94,7 +94,7 @@ zfsd_degrade_002_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/zfsd.cfg - verify_disk_count "$DISKS" 3 + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfsd_degrade_002_pos.ksh if [[ $? != 0 ]]; then @@ -504,6 +504,7 @@ zfsd_import_001_pos_body() . $(atf_get_srcdir)/../hotspare/hotspare.kshlib . $(atf_get_srcdir)/../hotspare/hotspare.cfg + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfsd_import_001_pos.ksh || atf_fail "Testcase failed" if [[ $? != 0 ]]; then From owner-svn-src-projects@freebsd.org Wed Aug 30 22:33:38 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E332EE0BD53 for ; Wed, 30 Aug 2017 22:33:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8A2982DE9; Wed, 30 Aug 2017 22:33:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7UMXbbF068065; Wed, 30 Aug 2017 22:33:37 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UMXZRC068047; Wed, 30 Aug 2017 22:33:35 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708302233.v7UMXZRC068047@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 30 Aug 2017 22:33:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323038 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/hotspare tests/sas_phy_thrash tests/zfsd tests/zvol_thrash X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/hotspare tests/sas_phy_thrash tests/zfsd tests/zvol_thrash X-SVN-Commit-Revision: 323038 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Aug 2017 22:33:39 -0000 Author: asomers Date: Wed Aug 30 22:33:35 2017 New Revision: 323038 URL: https://svnweb.freebsd.org/changeset/base/323038 Log: Remove unhelpful $Id$ tags Submitted by: will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libsas.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libsas.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libsas.kshlib Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libsas.kshlib Wed Aug 30 22:33:35 2017 (r323038) @@ -27,7 +27,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/include/libsas.kshlib#2 $ # $FreeBSD$ # Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -28,7 +28,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id$ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/cleanup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/cleanup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -26,7 +26,6 @@ # # ident "@(#)cleanup.ksh 1.2 07/01/09 SMI" # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/tests/sas_phy_thrash/cleanup.ksh#2 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash.cfg Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash.cfg Wed Aug 30 22:33:35 2017 (r323038) @@ -27,7 +27,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash.cfg#2 $ # $FreeBSD$ # export SAS_MIN_DEFAULT_DISKS=8 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_001_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -28,7 +28,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_001_pos.ksh#2 $ # $FreeBSD$ # Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/setup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -26,7 +26,6 @@ # # ident "@(#)setup.ksh 1.3 09/05/19 SMI" # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/tests/sas_phy_thrash/setup.ksh#2 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/cleanup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -24,7 +24,6 @@ # Copyright (c) 2012,2013 Spectra Logic Corporation. All rights reserved. # Use is subject to license terms. # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/soft_errors/cleanup.ksh#1 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -24,7 +24,6 @@ # Copyright (c) 2012,2013 Spectra Logic Corporation. All rights reserved. # Use is subject to license terms. # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/soft_errors/setup.ksh#1 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_001_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -24,7 +24,6 @@ # Copyright (c) 2012,2013 Spectra Logic Corporation. All rights reserved. # Use is subject to license terms. # -# $Id: $ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_degrade_002_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -24,7 +24,6 @@ # Copyright (c) 2012-2014 Spectra Logic Corporation. All rights reserved. # Use is subject to license terms. # -# $Id: $ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -24,7 +24,6 @@ # Copyright (c) 2012,2013 Spectra Logic Corporation. All rights reserved. # Use is subject to license terms. # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/soft_errors/soft_errors_001_pos.ksh#2 $ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -30,7 +30,6 @@ # Portions taken from: # ident "@(#)replacement_001_pos.ksh 1.4 08/02/27 SMI" # -# $Id: //SpectraBSD/stable/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh#2 $ # $FreeBSD$ . $STF_SUITE/tests/hotspare/hotspare.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_002_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -30,7 +30,6 @@ # Portions taken from: # ident "@(#)replacement_001_pos.ksh 1.4 08/02/27 SMI" # -# $Id$ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_003_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -30,7 +30,6 @@ # Portions taken from: # ident "@(#)replacement_001_pos.ksh 1.4 08/02/27 SMI" # -# $Id: //SpectraBSD/stable/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/zfsd/zfsd_replace_003_pos.ksh#1 $ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/cleanup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/cleanup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -26,7 +26,6 @@ # # ident "@(#)cleanup.ksh 1.2 07/01/09 SMI" # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/sas_phy_thrash/cleanup.ksh#1 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/setup.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/setup.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -26,7 +26,6 @@ # # ident "@(#)setup.ksh 1.3 09/05/19 SMI" # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/sas_phy_thrash/setup.ksh#1 $ # $FreeBSD$ . ${STF_SUITE}/include/libtest.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash.cfg Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash.cfg Wed Aug 30 22:33:35 2017 (r323038) @@ -27,7 +27,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/sas_phy_thrash/sas_phy_thrash.cfg#1 $ # $FreeBSD$ # export SAS_DEFAULT_TIME=360 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh Wed Aug 30 22:33:35 2017 (r323038) @@ -28,7 +28,6 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGES. # -# $Id: //depot/SpectraBSD/stable/9/cddl/tools/regression/stc/src/suites/fs/zfs/tests/functional/sas_phy_thrash/sas_phy_thrash_001_pos.ksh#1 $ # $FreeBSD$ # From owner-svn-src-projects@freebsd.org Thu Aug 31 14:27:11 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 560D0E1FBD8 for ; Thu, 31 Aug 2017 14:27:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 308E37E537; Thu, 31 Aug 2017 14:27:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VERAIr058415; Thu, 31 Aug 2017 14:27:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VERAqQ058412; Thu, 31 Aug 2017 14:27:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201708311427.v7VERAqQ058412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 31 Aug 2017 14:27:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323055 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_upgrade zpool_upgrade X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_upgrade zpool_upgrade X-SVN-Commit-Revision: 323055 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2017 14:27:11 -0000 Author: asomers Date: Thu Aug 31 14:27:09 2017 New Revision: 323055 URL: https://svnweb.freebsd.org/changeset/base/323055 Log: Fix zfs_upgraded tests for zpool version 5000 tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Fix default_check_zfs_upgrade and default_setup_datasets for zpool version 5000 tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Reenable zpool_upgrade_007_pos. It passed more than 300 times, so the panic that it previously caused has probably been fixed. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Thu Aug 31 14:21:32 2017 (r323054) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade.kshlib Thu Aug 31 14:27:09 2017 (r323055) @@ -41,11 +41,22 @@ set -A spa_create_versions 9 15 24 set -A zpl_upgrade_versions 3 4 5 set -A spa_upgrade_versions 9 15 24 +function get_pool_version #pool +{ + typeset pool=$1 + typeset vs=$(get_pool_prop version $pool) + if [ "$vs" = "-" ]; then + echo 5000 + else + echo "$vs" + fi +} + function default_setup_datasets #rootfs { typeset rootfs=$1 typeset pool=${rootfs%%/*} - typeset -i vp=$(get_pool_prop version $pool) + typeset -i vp=$(get_pool_version $pool) typeset -i version typeset -i m typeset -i spa_version @@ -118,7 +129,7 @@ function default_check_zfs_upgrade #rootfs { typeset rootfs=$1 typeset pool=${rootfs%%/*} - typeset -i vp=$(get_pool_prop version $pool) + typeset -i vp="$(get_pool_version $pool)" typeset -i m typeset -i spa_version typeset -i zpl_version @@ -151,7 +162,7 @@ function default_check_zfs_upgrade #rootfs if (( spa_version != 0 )) && (( vp < spa_version )); then log_mustnot eval '$ZFS upgrade $opt -a > /dev/null 2>&1' log_must eval '$ZPOOL upgrade $pool > /dev/null 2>&1' - vp=$(get_pool_prop version $pool) + vp="$(get_pool_version $pool)" fi log_must eval '$ZFS upgrade $opt -a > /dev/null 2>&1' Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Thu Aug 31 14:21:32 2017 (r323054) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Thu Aug 31 14:27:09 2017 (r323055) @@ -199,7 +199,6 @@ zpool_upgrade_007_pos_head() } zpool_upgrade_007_pos_body() { - atf_fail "This test causes a panic on FreeBSD" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg From owner-svn-src-projects@freebsd.org Fri Sep 1 19:58:44 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A471EE0379B for ; Fri, 1 Sep 2017 19:58:44 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5458721C0; Fri, 1 Sep 2017 19:58:44 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81Jwhot083982; Fri, 1 Sep 2017 19:58:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81JwgJk083965; Fri, 1 Sep 2017 19:58:42 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709011958.v81JwgJk083965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 1 Sep 2017 19:58:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323115 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user: . misc zfs_list zpool_iostat zpool_list X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user: . misc zfs_list zpool_iostat zpool_list X-SVN-Commit-Revision: 323115 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 19:58:44 -0000 Author: asomers Date: Fri Sep 1 19:58:42 2017 New Revision: 323115 URL: https://svnweb.freebsd.org/changeset/base/323115 Log: Fix ZFS's unprivileged tests The tests used to fail because the kyua process couldn't write to its own log files after dropping privileges. This change fixes them by dropping privileges only for the commands under test, so log file access will still happen as root. A few tests (zpool_create_001_neg, zpool_create_002_pos, zpool_iostat_003_neg, and zpool_list_002_neg) don't require any setup, so they can run fully unprivileged. Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg 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/zdb_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_allow_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_clone_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_create_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_destroy_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_get_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_inherit_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_mount_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_promote_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_receive_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_rename_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_rollback_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_send_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_set_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_share_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_snapshot_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unallow_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unmount_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_unshare_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_upgrade_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_attach_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_clear_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_destroy_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_detach_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_export_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_get_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_history_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_import_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_import_002_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_offline_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_online_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_remove_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_replace_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_scrub_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_set_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_status_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_upgrade_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_004_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_006_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_007_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_008_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/Makefile Fri Sep 1 19:58:42 2017 (r323115) @@ -9,6 +9,7 @@ FILESDIR=${TESTSDIR} ${PACKAGE}FILES+= setup.ksh ${PACKAGE}FILES+= cleanup.ksh ${PACKAGE}FILES+= cli.cfg +${PACKAGE}FILES+= cli_user.kshlib TESTS_SUBDIRS+= zpool_iostat TESTS_SUBDIRS+= zpool_list Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli.cfg Fri Sep 1 19:58:42 2017 (r323115) @@ -30,3 +30,4 @@ export TESTSNAP=testsnap${TESTCASE_ID} export TESTCLCT=testclct${TESTCASE_ID} export TESTFILE0=testfile0.${TESTCASE_ID} export TESTFILE1=testfile1.${TESTCASE_ID} +export UNPRIVILEGED_USER=`atf_config_get unprivileged_user` Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/cli_user.kshlib Fri Sep 1 19:58:42 2017 (r323115) @@ -0,0 +1,32 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2017 Spectra Logic Corp. All rights reserved. +# Use is subject to license terms. + +. $STF_SUITE/include/libtest.kshlib + +# Executes $@ without root privileges +function run_unprivileged +{ + echo "$@" | su -m "$UNPRIVILEGED_USER" +} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc.cfg Fri Sep 1 19:58:42 2017 (r323115) @@ -26,7 +26,7 @@ # ident "@(#)misc.cfg 1.1 07/10/09 SMI" # -# . $STF_SUITE/tests/cli_user/cli.cfg +. $STF_SUITE/tests/cli_user/cli.cfg # these are the set of setable ZFS properties @@ -67,4 +67,3 @@ POOL_VALS="\ POOL_ALTVALS="\ $TESTPOOL/$TESTFS/$TESTFS2 off" - 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 Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Fri Sep 1 19:58:42 2017 (r323115) @@ -30,6 +30,7 @@ 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 fgrep zpool zdb atf_set "require.user" root + atf_set "require.config" unprivileged_user } zdb_001_neg_body() { @@ -37,7 +38,7 @@ zdb_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh || atf_fail "Testcase failed" } zdb_001_neg_cleanup() { @@ -54,6 +55,7 @@ zfs_001_neg_head() atf_set "descr" "zfs shows a usage message when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_001_neg_body() { @@ -61,7 +63,7 @@ zfs_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh || atf_fail "Testcase failed" } zfs_001_neg_cleanup() { @@ -78,6 +80,7 @@ zfs_allow_001_neg_head() atf_set "descr" "zfs allow returns an error when run as a user" atf_set "require.progs" zfs fgrep logname zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_allow_001_neg_body() { @@ -85,7 +88,7 @@ zfs_allow_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_allow_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_allow_001_neg.ksh || atf_fail "Testcase failed" } zfs_allow_001_neg_cleanup() { @@ -102,6 +105,7 @@ zfs_clone_001_neg_head() atf_set "descr" "zfs clone returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_clone_001_neg_body() { @@ -109,7 +113,7 @@ zfs_clone_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh || atf_fail "Testcase failed" } zfs_clone_001_neg_cleanup() { @@ -126,6 +130,7 @@ zfs_create_001_neg_head() atf_set "descr" "Verify zfs create without parameters fails." atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_create_001_neg_body() { @@ -133,7 +138,7 @@ zfs_create_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_create_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_create_001_neg.ksh || atf_fail "Testcase failed" } zfs_create_001_neg_cleanup() { @@ -150,6 +155,7 @@ zfs_destroy_001_neg_head() atf_set "descr" "zfs destroy [-f|-r] [fs|snap]" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_destroy_001_neg_body() { @@ -157,7 +163,7 @@ zfs_destroy_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_destroy_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_destroy_001_neg.ksh || atf_fail "Testcase failed" } zfs_destroy_001_neg_cleanup() { @@ -174,6 +180,7 @@ zfs_get_001_neg_head() atf_set "descr" "zfs get works when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_get_001_neg_body() { @@ -181,7 +188,7 @@ zfs_get_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_get_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_get_001_neg.ksh || atf_fail "Testcase failed" } zfs_get_001_neg_cleanup() { @@ -198,6 +205,7 @@ zfs_inherit_001_neg_head() atf_set "descr" "zfs inherit returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_inherit_001_neg_body() { @@ -205,7 +213,7 @@ zfs_inherit_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh || atf_fail "Testcase failed" } zfs_inherit_001_neg_cleanup() { @@ -222,6 +230,7 @@ zfs_mount_001_neg_head() atf_set "descr" "zfs mount returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_mount_001_neg_body() { @@ -229,7 +238,7 @@ zfs_mount_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_mount_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_mount_001_neg.ksh || atf_fail "Testcase failed" } zfs_mount_001_neg_cleanup() { @@ -246,6 +255,7 @@ zfs_promote_001_neg_head() atf_set "descr" "zfs promote returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_promote_001_neg_body() { @@ -253,7 +263,7 @@ zfs_promote_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_promote_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_promote_001_neg.ksh || atf_fail "Testcase failed" } zfs_promote_001_neg_cleanup() { @@ -270,6 +280,7 @@ zfs_receive_001_neg_head() atf_set "descr" "zfs receive returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_receive_001_neg_body() { @@ -277,7 +288,7 @@ zfs_receive_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_receive_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_receive_001_neg.ksh || atf_fail "Testcase failed" } zfs_receive_001_neg_cleanup() { @@ -294,6 +305,7 @@ zfs_rename_001_neg_head() atf_set "descr" "zfs rename returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_rename_001_neg_body() { @@ -301,7 +313,7 @@ zfs_rename_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_rename_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_rename_001_neg.ksh || atf_fail "Testcase failed" } zfs_rename_001_neg_cleanup() { @@ -318,6 +330,7 @@ zfs_rollback_001_neg_head() atf_set "descr" "zfs rollback returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_rollback_001_neg_body() { @@ -325,7 +338,7 @@ zfs_rollback_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_rollback_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_rollback_001_neg.ksh || atf_fail "Testcase failed" } zfs_rollback_001_neg_cleanup() { @@ -342,6 +355,7 @@ zfs_send_001_neg_head() atf_set "descr" "zfs send returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_send_001_neg_body() { @@ -349,7 +363,7 @@ zfs_send_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_send_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_send_001_neg.ksh || atf_fail "Testcase failed" } zfs_send_001_neg_cleanup() { @@ -366,6 +380,7 @@ zfs_set_001_neg_head() atf_set "descr" "zfs set returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_set_001_neg_body() { @@ -373,7 +388,7 @@ zfs_set_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_set_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_set_001_neg.ksh || atf_fail "Testcase failed" } zfs_set_001_neg_cleanup() { @@ -390,6 +405,7 @@ zfs_share_001_neg_head() atf_set "descr" "zfs share returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_share_001_neg_body() { @@ -397,7 +413,7 @@ zfs_share_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_share_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_share_001_neg.ksh || atf_fail "Testcase failed" } zfs_share_001_neg_cleanup() { @@ -414,6 +430,7 @@ zfs_snapshot_001_neg_head() atf_set "descr" "zfs snapshot returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_snapshot_001_neg_body() { @@ -421,7 +438,7 @@ zfs_snapshot_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_snapshot_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_snapshot_001_neg.ksh || atf_fail "Testcase failed" } zfs_snapshot_001_neg_cleanup() { @@ -438,6 +455,7 @@ zfs_unallow_001_neg_head() atf_set "descr" "zfs unallow returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_unallow_001_neg_body() { @@ -445,7 +463,7 @@ zfs_unallow_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unallow_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_unallow_001_neg.ksh || atf_fail "Testcase failed" } zfs_unallow_001_neg_cleanup() { @@ -462,6 +480,7 @@ zfs_unmount_001_neg_head() atf_set "descr" "zfs u[n]mount [-f] [mountpoint|fs|snap]" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_unmount_001_neg_body() { @@ -469,7 +488,7 @@ zfs_unmount_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unmount_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_unmount_001_neg.ksh || atf_fail "Testcase failed" } zfs_unmount_001_neg_cleanup() { @@ -486,6 +505,7 @@ zfs_unshare_001_neg_head() atf_set "descr" "zfs unshare returns an error when run as a user" atf_set "require.progs" zfs fgrep share zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_unshare_001_neg_body() { @@ -493,7 +513,7 @@ zfs_unshare_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_unshare_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_unshare_001_neg.ksh || atf_fail "Testcase failed" } zfs_unshare_001_neg_cleanup() { @@ -510,6 +530,7 @@ zfs_upgrade_001_neg_head() atf_set "descr" "zfs upgrade returns an error when run as a user" atf_set "require.progs" zfs fgrep zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zfs_upgrade_001_neg_body() { @@ -517,7 +538,7 @@ zfs_upgrade_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zfs_upgrade_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zfs_upgrade_001_neg.ksh || atf_fail "Testcase failed" } zfs_upgrade_001_neg_cleanup() { @@ -534,6 +555,7 @@ zpool_001_neg_head() atf_set "descr" "zpool shows a usage message when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_001_neg_body() { @@ -541,7 +563,7 @@ zpool_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_001_neg.ksh || atf_fail "Testcase failed" } zpool_001_neg_cleanup() { @@ -558,6 +580,7 @@ zpool_add_001_neg_head() atf_set "descr" "zpool add [-fn] pool_name vdev" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_add_001_neg_body() { @@ -565,7 +588,7 @@ zpool_add_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_add_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_add_001_neg.ksh || atf_fail "Testcase failed" } zpool_add_001_neg_cleanup() { @@ -582,6 +605,7 @@ zpool_add_001_neg_head() atf_set "descr" "zpool add [-f] -n succeeds for unpriveleged users" atf_set "require.progs" zfs zpool atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_add_002_pos_body() { @@ -589,7 +613,7 @@ zpool_add_002_pos_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh || atf_fail "Testcase failed" } zpool_add_002_pos_cleanup() { @@ -606,6 +630,7 @@ zpool_attach_001_neg_head() atf_set "descr" "zpool attach returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_attach_001_neg_body() { @@ -613,7 +638,7 @@ zpool_attach_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh || atf_fail "Testcase failed" } zpool_attach_001_neg_cleanup() { @@ -630,6 +655,7 @@ zpool_clear_001_neg_head() atf_set "descr" "zpool clear returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_clear_001_neg_body() { @@ -637,7 +663,7 @@ zpool_clear_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_clear_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_clear_001_neg.ksh || atf_fail "Testcase failed" } zpool_clear_001_neg_cleanup() { @@ -648,57 +674,44 @@ zpool_clear_001_neg_cleanup() } -atf_test_case zpool_create_001_neg cleanup +atf_test_case zpool_create_001_neg zpool_create_001_neg_head() { atf_set "descr" "zpool create [-f] fails for unpriveleged users" atf_set "require.progs" zfs zpool - atf_set "require.user" root + atf_set "require.user" unprivileged } zpool_create_001_neg_body() { . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg - # No setup is required for this test. - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_create_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_create_001_neg.ksh || atf_fail "Testcase failed" } -zpool_create_001_neg_cleanup() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - -atf_test_case zpool_create_002_pos cleanup +atf_test_case zpool_create_002_pos zpool_create_002_pos_head() { atf_set "descr" "zpool create [-f] -n succeeds for unpriveleged users" atf_set "require.progs" zfs zpool - atf_set "require.user" root + atf_set "require.user" unprivileged } zpool_create_002_pos_body() { . $(atf_get_srcdir)/../../../include/default.cfg - # No setup is required for this test. - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_create_002_pos.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_create_002_pos.ksh || atf_fail "Testcase failed" } -zpool_create_002_pos_cleanup() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - atf_test_case zpool_destroy_001_neg cleanup zpool_destroy_001_neg_head() { atf_set "descr" "zpool destroy [-f] [pool_name ...]" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_destroy_001_neg_body() { @@ -706,7 +719,7 @@ zpool_destroy_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_destroy_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_destroy_001_neg.ksh || atf_fail "Testcase failed" } zpool_destroy_001_neg_cleanup() { @@ -723,6 +736,7 @@ zpool_detach_001_neg_head() atf_set "descr" "zpool detach returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_detach_001_neg_body() { @@ -730,7 +744,7 @@ zpool_detach_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh || atf_fail "Testcase failed" } zpool_detach_001_neg_cleanup() { @@ -747,6 +761,7 @@ zpool_export_001_neg_head() atf_set "descr" "zpool export returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_export_001_neg_body() { @@ -754,7 +769,7 @@ zpool_export_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_export_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_export_001_neg.ksh || atf_fail "Testcase failed" } zpool_export_001_neg_cleanup() { @@ -771,6 +786,7 @@ zpool_get_001_neg_head() atf_set "descr" "zpool get works when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_get_001_neg_body() { @@ -778,7 +794,7 @@ zpool_get_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_get_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_get_001_neg.ksh || atf_fail "Testcase failed" } zpool_get_001_neg_cleanup() { @@ -795,6 +811,7 @@ zpool_history_001_neg_head() atf_set "descr" "zpool history returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_history_001_neg_body() { @@ -802,7 +819,7 @@ zpool_history_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh || atf_fail "Testcase failed" } zpool_history_001_neg_cleanup() { @@ -819,6 +836,7 @@ zpool_import_001_neg_head() atf_set "descr" "zpool import returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_import_001_neg_body() { @@ -826,7 +844,7 @@ zpool_import_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_import_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_import_001_neg.ksh || atf_fail "Testcase failed" } zpool_import_001_neg_cleanup() { @@ -843,6 +861,7 @@ zpool_import_002_neg_head() atf_set "descr" "Executing 'zpool import' by regular user fails" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_import_002_neg_body() { @@ -850,7 +869,7 @@ zpool_import_002_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_import_002_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_import_002_neg.ksh || atf_fail "Testcase failed" } zpool_import_002_neg_cleanup() { @@ -867,6 +886,7 @@ zpool_offline_001_neg_head() atf_set "descr" "zpool offline returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_offline_001_neg_body() { @@ -874,7 +894,7 @@ zpool_offline_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_offline_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_offline_001_neg.ksh || atf_fail "Testcase failed" } zpool_offline_001_neg_cleanup() { @@ -891,6 +911,7 @@ zpool_online_001_neg_head() atf_set "descr" "zpool online returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_online_001_neg_body() { @@ -898,7 +919,7 @@ zpool_online_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_online_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_online_001_neg.ksh || atf_fail "Testcase failed" } zpool_online_001_neg_cleanup() { @@ -915,6 +936,7 @@ zpool_remove_001_neg_head() atf_set "descr" "zpool remove returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_remove_001_neg_body() { @@ -922,7 +944,7 @@ zpool_remove_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_remove_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_remove_001_neg.ksh || atf_fail "Testcase failed" } zpool_remove_001_neg_cleanup() { @@ -939,6 +961,7 @@ zpool_replace_001_neg_head() atf_set "descr" "zpool replace returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_replace_001_neg_body() { @@ -946,7 +969,7 @@ zpool_replace_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh || atf_fail "Testcase failed" } zpool_replace_001_neg_cleanup() { @@ -963,6 +986,7 @@ zpool_scrub_001_neg_head() atf_set "descr" "zpool scrub returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_scrub_001_neg_body() { @@ -970,7 +994,7 @@ zpool_scrub_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh || atf_fail "Testcase failed" } zpool_scrub_001_neg_cleanup() { @@ -987,6 +1011,7 @@ zpool_set_001_neg_head() atf_set "descr" "zpool set returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_set_001_neg_body() { @@ -994,7 +1019,7 @@ zpool_set_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_set_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_set_001_neg.ksh || atf_fail "Testcase failed" } zpool_set_001_neg_cleanup() { @@ -1011,6 +1036,7 @@ zpool_status_001_neg_head() atf_set "descr" "zpool status works when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_status_001_neg_body() { @@ -1018,7 +1044,7 @@ zpool_status_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_status_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_status_001_neg.ksh || atf_fail "Testcase failed" } zpool_status_001_neg_cleanup() { @@ -1035,6 +1061,7 @@ zpool_upgrade_001_neg_head() atf_set "descr" "zpool upgrade returns an error when run as a user" atf_set "require.progs" zfs zpool fgrep atf_set "require.user" root + atf_set "require.config" unprivileged_user } zpool_upgrade_001_neg_body() { @@ -1042,7 +1069,7 @@ zpool_upgrade_001_neg_body() . $(atf_get_srcdir)/misc.cfg ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - su -m `atf_config_get unprivileged_user` -c "ksh93 $(atf_get_srcdir)/zpool_upgrade_001_neg.ksh" || atf_fail "Testcase failed" + ksh93 $(atf_get_srcdir)/zpool_upgrade_001_neg.ksh || atf_fail "Testcase failed" } zpool_upgrade_001_neg_cleanup() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zdb_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zdb_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zdb_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -55,7 +56,7 @@ function check_zdb { - $@ > $TMPDIR/zdb.${TESTCASE_ID} + run_unprivileged $@ > $TMPDIR/zdb.${TESTCASE_ID} $GREP "Dataset mos" $TMPDIR/zdb.${TESTCASE_ID} if [ $? -eq 0 ] then @@ -79,10 +80,9 @@ verify_runnable "global" log_assert "zdb can't run as a user on datasets, but can run without arguments" log_onexit cleanup -log_must eval "$ZDB > $TMPDIR/zdb_001_neg.${TESTCASE_ID}.txt" +run_unprivileged $ZDB > $TMPDIR/zdb_001_neg.${TESTCASE_ID}.txt || log_fail "$ZDB failed" # verify the output looks okay log_must $GREP pool_guid $TMPDIR/zdb_001_neg.${TESTCASE_ID}.txt -log_must $RM $TMPDIR/zdb_001_neg.${TESTCASE_ID}.txt # we shouldn't able to run it on any dataset check_zdb $ZDB $TESTPOOL Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -64,7 +65,7 @@ function cleanup log_onexit cleanup log_assert "zfs shows a usage message when run as a user" -eval "$ZFS > $TMPDIR/zfs_001_neg.${TESTCASE_ID}.txt 2>&1" +run_unprivileged "$ZFS" > $TMPDIR/zfs_001_neg.${TESTCASE_ID}.txt 2>&1 log_must $GREP "usage: zfs command args" $TMPDIR/zfs_001_neg.${TESTCASE_ID}.txt log_pass "zfs shows a usage message when run as a user" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_allow_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_allow_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_allow_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -63,13 +64,13 @@ fi log_assert "zfs allow returns an error when run as a user" -log_must $ZFS allow $TESTPOOL/$TESTFS -log_mustnot $ZFS allow `$LOGNAME` create $TESTPOOL/$TESTFS +log_must run_unprivileged "$ZFS allow $TESTPOOL/$TESTFS" +log_mustnot run_unprivileged "$ZFS allow `$LOGNAME` create $TESTPOOL/$TESTFS" # now verify that the above command actually did nothing by # checking for any allow output. ( if no allows are granted, # nothing should be output ) -OUTPUT=$($ZFS allow $TESTPOOL/$TESTFS | $GREP "Local+Descendent" ) +OUTPUT=$(run_unprivileged "$ZFS allow $TESTPOOL/$TESTFS" | $GREP "Local+Descendent" ) if [ -n "$OUTPUT" ] then log_fail "zfs allow permissions were granted on $TESTPOOL/$TESTFS" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_clone_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_clone_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_clone_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -55,7 +56,7 @@ ################################################################################ log_assert "zfs clone returns an error when run as a user" -log_mustnot $ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS.myclone +log_mustnot run_unprivileged "$ZFS clone $TESTPOOL/$TESTFS@snap $TESTPOOL/$TESTFS.myclone" # check to see that the above command really did nothing if datasetexists $TESTPOOL/$TESTFS.myclone Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_create_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_create_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_create_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -27,6 +27,7 @@ # ident "@(#)zfs_create_001_neg.ksh 1.3 07/10/09 SMI" # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -64,7 +65,7 @@ log_assert "Verify zfs create without parameters fails typeset -i i=0 while [[ $i -lt ${#args[*]} ]]; do - log_mustnot $ZFS ${args[i]} + log_mustnot run_unprivileged "$ZFS ${args[i]}" ((i = i + 1)) done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_destroy_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_destroy_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_destroy_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -27,6 +27,7 @@ # ident "@(#)zfs_destroy_001_neg.ksh 1.3 07/10/09 SMI" # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -70,7 +71,7 @@ log_assert "zfs destroy [-f|-r] [fs|snap]" typeset -i i=0 while [[ $i -lt ${#args[*]} ]]; do - log_mustnot $ZFS ${args[i]} + log_mustnot run_unprivileged "$ZFS ${args[i]}" ((i = i + 1)) done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_get_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_get_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_get_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -65,7 +66,7 @@ while [[ $i -lt ${#args[*]} ]] do PROP=${props[$i]} EXPECTED=${prop_vals[$i]} - ACTUAL=$( $ZFS get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop ) + ACTUAL=$( run_unprivileged "$ZFS get $PROP -o value -H snapdir $TESTPOOl/$TESTFS/prop" ) if [ "$ACTUAL" != "$EXPECTED" ] then log_fail "Property $PROP value was $ACTUAL, expected $EXPECTED" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_inherit_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_inherit_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_inherit_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/tests/cli_user/cli_user.kshlib ################################################################################ # @@ -55,7 +56,7 @@ ################################################################################ log_assert "zfs inherit returns an error when run as a user" -log_mustnot $ZFS inherit snapdir $TESTPOOL/$TESTFS/$TESTFS2 +log_mustnot run_unprivileged "$ZFS inherit snapdir $TESTPOOL/$TESTFS/$TESTFS2" # check to see that the above command really did nothing PROP=$($ZFS get snapdir $TESTPOOL/$TESTFS) Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_mount_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_mount_001_neg.ksh Fri Sep 1 19:15:53 2017 (r323114) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zfs_mount_001_neg.ksh Fri Sep 1 19:58:42 2017 (r323115) @@ -28,6 +28,7 @@ # *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Sep 1 20:03:05 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2463CE03BD8 for ; Fri, 1 Sep 2017 20:03:05 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7D982694; Fri, 1 Sep 2017 20:03:04 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81K34jE087956; Fri, 1 Sep 2017 20:03:04 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81K34wO087955; Fri, 1 Sep 2017 20:03:04 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709012003.v81K34wO087955@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 1 Sep 2017 20:03:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323116 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc X-SVN-Commit-Revision: 323116 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 20:03:05 -0000 Author: asomers Date: Fri Sep 1 20:03:03 2017 New Revision: 323116 URL: https://svnweb.freebsd.org/changeset/base/323116 Log: Fix a typo in zpool_add_002_pos Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh 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 Fri Sep 1 19:58:42 2017 (r323115) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Fri Sep 1 20:03:03 2017 (r323116) @@ -600,7 +600,7 @@ zpool_add_001_neg_cleanup() atf_test_case zpool_add_002_pos cleanup -zpool_add_001_neg_head() +zpool_add_002_pos_head() { atf_set "descr" "zpool add [-f] -n succeeds for unpriveleged users" atf_set "require.progs" zfs zpool From owner-svn-src-projects@freebsd.org Fri Sep 1 20:12:20 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F909E04370 for ; Fri, 1 Sep 2017 20:12:20 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED8832C20; Fri, 1 Sep 2017 20:12:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81KCJmP092107; Fri, 1 Sep 2017 20:12:19 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81KCIGk092100; Fri, 1 Sep 2017 20:12:18 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709012012.v81KCIGk092100@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 1 Sep 2017 20:12:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323117 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user: misc zfs_list zpool_iostat zpool_list X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user: misc zfs_list zpool_iostat zpool_list X-SVN-Commit-Revision: 323117 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 20:12:20 -0000 Author: asomers Date: Fri Sep 1 20:12:18 2017 New Revision: 323117 URL: https://svnweb.freebsd.org/changeset/base/323117 Log: Skip cli_user tests when insufficient disks are available tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh Add appropriate verify_disk_count calls tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh Fix these tests so they won't attempt to add a disk that's already in use. Sponsored by: Spectra Logic Corp 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/zpool_add_001_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh 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 Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Fri Sep 1 20:12:18 2017 (r323117) @@ -37,6 +37,7 @@ zdb_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh || atf_fail "Testcase failed" } @@ -62,6 +63,7 @@ zfs_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh || atf_fail "Testcase failed" } @@ -87,6 +89,7 @@ zfs_allow_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_allow_001_neg.ksh || atf_fail "Testcase failed" } @@ -112,6 +115,7 @@ zfs_clone_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh || atf_fail "Testcase failed" } @@ -137,6 +141,7 @@ zfs_create_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_create_001_neg.ksh || atf_fail "Testcase failed" } @@ -162,6 +167,7 @@ zfs_destroy_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_destroy_001_neg.ksh || atf_fail "Testcase failed" } @@ -187,6 +193,7 @@ zfs_get_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_get_001_neg.ksh || atf_fail "Testcase failed" } @@ -212,6 +219,7 @@ zfs_inherit_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh || atf_fail "Testcase failed" } @@ -237,6 +245,7 @@ zfs_mount_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_mount_001_neg.ksh || atf_fail "Testcase failed" } @@ -262,6 +271,7 @@ zfs_promote_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_promote_001_neg.ksh || atf_fail "Testcase failed" } @@ -287,6 +297,7 @@ zfs_receive_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_receive_001_neg.ksh || atf_fail "Testcase failed" } @@ -312,6 +323,7 @@ zfs_rename_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_rename_001_neg.ksh || atf_fail "Testcase failed" } @@ -337,6 +349,7 @@ zfs_rollback_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_rollback_001_neg.ksh || atf_fail "Testcase failed" } @@ -362,6 +375,7 @@ zfs_send_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_send_001_neg.ksh || atf_fail "Testcase failed" } @@ -387,6 +401,7 @@ zfs_set_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_set_001_neg.ksh || atf_fail "Testcase failed" } @@ -412,6 +427,7 @@ zfs_share_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_share_001_neg.ksh || atf_fail "Testcase failed" } @@ -437,6 +453,7 @@ zfs_snapshot_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_snapshot_001_neg.ksh || atf_fail "Testcase failed" } @@ -462,6 +479,7 @@ zfs_unallow_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unallow_001_neg.ksh || atf_fail "Testcase failed" } @@ -487,6 +505,7 @@ zfs_unmount_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unmount_001_neg.ksh || atf_fail "Testcase failed" } @@ -512,6 +531,7 @@ zfs_unshare_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_unshare_001_neg.ksh || atf_fail "Testcase failed" } @@ -537,6 +557,7 @@ zfs_upgrade_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_upgrade_001_neg.ksh || atf_fail "Testcase failed" } @@ -562,6 +583,7 @@ zpool_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_001_neg.ksh || atf_fail "Testcase failed" } @@ -587,6 +609,7 @@ zpool_add_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_add_001_neg.ksh || atf_fail "Testcase failed" } @@ -612,6 +635,7 @@ zpool_add_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh || atf_fail "Testcase failed" } @@ -637,6 +661,7 @@ zpool_attach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh || atf_fail "Testcase failed" } @@ -662,6 +687,7 @@ zpool_clear_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_001_neg.ksh || atf_fail "Testcase failed" } @@ -686,6 +712,7 @@ zpool_create_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_create_001_neg.ksh || atf_fail "Testcase failed" } @@ -701,6 +728,7 @@ zpool_create_002_pos_body() { . $(atf_get_srcdir)/../../../include/default.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_create_002_pos.ksh || atf_fail "Testcase failed" } @@ -718,6 +746,7 @@ zpool_destroy_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_destroy_001_neg.ksh || atf_fail "Testcase failed" } @@ -743,6 +772,7 @@ zpool_detach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh || atf_fail "Testcase failed" } @@ -768,6 +798,7 @@ zpool_export_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_export_001_neg.ksh || atf_fail "Testcase failed" } @@ -793,6 +824,7 @@ zpool_get_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_get_001_neg.ksh || atf_fail "Testcase failed" } @@ -818,6 +850,7 @@ zpool_history_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh || atf_fail "Testcase failed" } @@ -843,6 +876,7 @@ zpool_import_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_001_neg.ksh || atf_fail "Testcase failed" } @@ -868,6 +902,7 @@ zpool_import_002_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_002_neg.ksh || atf_fail "Testcase failed" } @@ -893,6 +928,7 @@ zpool_offline_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_offline_001_neg.ksh || atf_fail "Testcase failed" } @@ -918,6 +954,7 @@ zpool_online_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_online_001_neg.ksh || atf_fail "Testcase failed" } @@ -943,6 +980,7 @@ zpool_remove_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_remove_001_neg.ksh || atf_fail "Testcase failed" } @@ -968,6 +1006,7 @@ zpool_replace_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh || atf_fail "Testcase failed" } @@ -993,6 +1032,7 @@ zpool_scrub_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh || atf_fail "Testcase failed" } @@ -1018,6 +1058,7 @@ zpool_set_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_set_001_neg.ksh || atf_fail "Testcase failed" } @@ -1043,6 +1084,7 @@ zpool_status_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_status_001_neg.ksh || atf_fail "Testcase failed" } @@ -1068,6 +1110,7 @@ zpool_upgrade_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/misc.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_001_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh Fri Sep 1 20:12:18 2017 (r323117) @@ -55,13 +55,9 @@ verify_runnable "global" -ADD_DISK="${DISKS%% }" -ADD_DISK="${ADD_DISK##* }" +set_disks -[[ -z $ADD_DISK ]] && \ - log_fail "No spare disks available." - -set -A args "add $TESTPOOL $ADD_DISK" "add -f $TESTPOOL $ADD_DISK" +set -A args "add $TESTPOOL $DISK1" "add -f $TESTPOOL $DISK1" log_assert "zpool add [-fn] pool_name vdev" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh Fri Sep 1 20:12:18 2017 (r323117) @@ -28,13 +28,9 @@ . $STF_SUITE/tests/cli_user/cli_user.kshlib -ADD_DISK="${DISKS%% }" -ADD_DISK="${ADD_DISK##* }" +set_disks -[[ -z $ADD_DISK ]] && \ - log_fail "No spare disks available." - -set -A args "add -n $TESTPOOL $ADD_DISK" "add -fn $TESTPOOL $ADD_DISK" +set -A args "add -n $TESTPOOL $DISK1" "add -fn $TESTPOOL $DISK1" log_assert "zpool add [-f] -n succeeds for unpriveleged users" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh Fri Sep 1 20:12:18 2017 (r323117) @@ -38,6 +38,7 @@ zfs_list_001_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_001_pos.ksh || atf_fail "Testcase failed" } @@ -65,6 +66,7 @@ zfs_list_002_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_002_pos.ksh || atf_fail "Testcase failed" } @@ -92,6 +94,7 @@ zfs_list_003_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_003_pos.ksh || atf_fail "Testcase failed" } @@ -119,6 +122,7 @@ zfs_list_004_neg_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_004_neg.ksh || atf_fail "Testcase failed" } @@ -146,6 +150,7 @@ zfs_list_005_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 atf_expect_fail "https://www.illumos.org/issues/8599 Snapshots don't preserve user properties" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_005_pos.ksh || atf_fail "Testcase failed" @@ -174,6 +179,7 @@ zfs_list_006_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_006_pos.ksh || atf_fail "Testcase failed" } @@ -201,6 +207,7 @@ zfs_list_007_pos_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_007_pos.ksh || atf_fail "Testcase failed" } @@ -228,6 +235,7 @@ zfs_list_008_neg_body() . $(atf_get_srcdir)/zfs_list.kshlib . $(atf_get_srcdir)/zfs_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_list_008_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh Fri Sep 1 20:12:18 2017 (r323117) @@ -37,6 +37,7 @@ zpool_iostat_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_iostat.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_iostat_001_neg.ksh || atf_fail "Testcase failed" } @@ -62,6 +63,7 @@ zpool_iostat_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_iostat.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_iostat_002_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Fri Sep 1 20:03:03 2017 (r323116) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Fri Sep 1 20:12:18 2017 (r323117) @@ -39,6 +39,7 @@ zpool_list_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_list.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_list_001_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Fri Sep 1 20:37:09 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 221B4E05702 for ; Fri, 1 Sep 2017 20:37:09 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F04DA36E6; Fri, 1 Sep 2017 20:37:08 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81Kb7sU000860; Fri, 1 Sep 2017 20:37:07 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81Kb7RG000858; Fri, 1 Sep 2017 20:37:07 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709012037.v81Kb7RG000858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 1 Sep 2017 20:37:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323118 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare X-SVN-Commit-Revision: 323118 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 20:37:09 -0000 Author: asomers Date: Fri Sep 1 20:37:07 2017 New Revision: 323118 URL: https://svnweb.freebsd.org/changeset/base/323118 Log: Fix hotspare_replace_003_neg This test contained usage errors that have been causing it to fail for an unknown amount of time. We never noticed, because it was marked as an expected failure. However, the underlying failure has since been fixed, so the test can pass now that I've fixed the usage errors. tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh Fix usage errors and improve description tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Clear expected failure Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh Fri Sep 1 20:12:18 2017 (r323117) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_replace_003_neg.ksh Fri Sep 1 20:37:07 2017 (r323118) @@ -34,10 +34,16 @@ . $STF_SUITE/include/libsas.kshlib . $STF_SUITE/tests/hotspare/hotspare.kshlib -# Reproduction script for Rally DE189: -# https://rally1.rallydev.com/#/9096795496d/detail/defect/13345916506 +# "zpool import" should not show destroyed pools, even if a non-destroyed label +# is present. # -# To reproduce, from Keith's email: +# This situation arose when a user activated a spare, removed the spare disk, +# destroyed the pool, reinserted the spare disk, and then tried to import the +# pool. Since the pool was destroyed, nothing should've happened. But the +# spare disk had a non-destroyed label, so zpool tried to import it. A panic +# ensued. +# +# To reproduce: # 1. Create a 3 drive raid. # 2. Disable a drive # 3. Let a Spare take over @@ -58,6 +64,7 @@ cleanup() { zpool status $TESTPOOL log_must destroy_pool $TESTPOOL fi + cleanup_devices ${DISKS} } log_onexit cleanup @@ -116,18 +123,18 @@ cleanup_devices ${MEMBERS[*]} ${SPARES[*]} log_must $ZPOOL create -f $TESTPOOL raidz1 ${MEMBERS[@]} spare ${SPARES[@]} DISK0_GUID=$(get_disk_guid $DISK0_NAME) -log_must disable_sas_disk $DISK0_EXPANDER $DISK0_PHY +disable_sas_disk $DISK0_EXPANDER $DISK0_PHY log_must $ZPOOL replace $TESTPOOL $DISK0_GUID $SPARE0_NAME wait_until_resilvered SPARE0_GUID=$(get_disk_guid $SPARE0_NAME) -log_must disable_sas_disk $SPARE0_EXPANDER $SPARE0_PHY +disable_sas_disk $SPARE0_EXPANDER $SPARE0_PHY log_must $ZPOOL replace $TESTPOOL $SPARE0_GUID $SPARE1_NAME wait_until_resilvered -log_must enable_sas_disk $SPARE0_EXPANDER $SPARE0_PHY -log_must enable_sas_disk $DISK0_EXPANDER $DISK0_PHY -log_must rescan_disks +enable_sas_disk $SPARE0_EXPANDER $SPARE0_PHY +enable_sas_disk $DISK0_EXPANDER $DISK0_PHY +rescan_disks log_must destroy_pool $TESTPOOL Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fri Sep 1 20:12:18 2017 (r323117) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fri Sep 1 20:37:07 2017 (r323118) @@ -607,7 +607,6 @@ hotspare_replace_003_neg_head() } hotspare_replace_003_neg_body() { - atf_expect_fail "Rally: DE189: ZFS config management needs improvement" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg From owner-svn-src-projects@freebsd.org Fri Sep 1 21:06:33 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08C3AE06DFB for ; Fri, 1 Sep 2017 21:06:33 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D358063914; Fri, 1 Sep 2017 21:06:32 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81L6VTS012925; Fri, 1 Sep 2017 21:06:31 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81L6V77012920; Fri, 1 Sep 2017 21:06:31 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709012106.v81L6V77012920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 1 Sep 2017 21:06:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323119 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zfs_copies tests/cli_root/zpool_add tests/cli_root/zpool_destroy tests/cli_root/zpool_expand X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zfs_copies tests/cli_root/zpool_add tests/cli_root/zpool_destroy tests/cli_root/zpool_expand X-SVN-Commit-Revision: 323119 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2017 21:06:33 -0000 Author: asomers Date: Fri Sep 1 21:06:31 2017 New Revision: 323119 URL: https://svnweb.freebsd.org/changeset/base/323119 Log: Conditionally skip ZFS tests that create zvol-backed pools By default creating zvol-backed pools is not allowed. One must set vfs.zfs.vol.recursive to allow it. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib 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/zpool_add/zpool_add_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Sep 1 20:37:07 2017 (r323118) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Sep 1 21:06:31 2017 (r323119) @@ -3066,6 +3066,17 @@ function verify_disk_count } # +# Verify that vfs.zfs.vol.recursive is set, so pools can be created using zvols +# as backing stores. +# +function verify_zvol_recursive +{ + if [ "`sysctl -n vfs.zfs.vol.recursive`" -ne 1 ]; then + atf_skip "Recursive ZVOLs not enabled" + fi +} + +# # bsdmap disk/slice number to a device path # function bsddevmap 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 Fri Sep 1 20:37:07 2017 (r323118) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh Fri Sep 1 21:06:31 2017 (r323119) @@ -82,11 +82,11 @@ zfs_copies_003_pos_head() } zfs_copies_003_pos_body() { - atf_expect_fail "BUG26166 Cannot create pools on zvols" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_copies.kshlib . $(atf_get_srcdir)/zfs_copies.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_copies_003_pos.ksh || atf_fail "Testcase failed" } 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 Fri Sep 1 20:37:07 2017 (r323118) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Sep 1 21:06:31 2017 (r323119) @@ -115,11 +115,11 @@ zpool_add_004_pos_head() } zpool_add_004_pos_body() { - atf_expect_fail "BUG26166 Cannot create pools on zvols" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_add.kshlib . $(atf_get_srcdir)/zpool_add.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_add_004_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Fri Sep 1 20:37:07 2017 (r323118) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Fri Sep 1 21:06:31 2017 (r323119) @@ -33,10 +33,10 @@ zpool_destroy_001_pos_head() } zpool_destroy_001_pos_body() { - atf_expect_fail 'BUG26166 cannot create pools on zvols' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_destroy.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/zpool_destroy_001_pos.ksh || atf_fail "Testcase failed" } zpool_destroy_001_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Fri Sep 1 20:37:07 2017 (r323118) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh Fri Sep 1 21:06:31 2017 (r323119) @@ -32,11 +32,10 @@ zpool_expand_001_pos_head() } zpool_expand_001_pos_body() { - atf_fail "This test causes a panic on FreeBSD" - atf_expect_fail 'BUG26166 cannot create pools on zvols' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_expand_001_pos.ksh || atf_fail "Testcase failed" } @@ -57,11 +56,10 @@ zpool_expand_002_pos_head() } zpool_expand_002_pos_body() { - atf_fail "This test causes a panic on FreeBSD" - atf_expect_fail 'BUG26166 cannot create pools on zvols' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_expand_002_pos.ksh || atf_fail "Testcase failed" } @@ -82,11 +80,10 @@ zpool_expand_003_neg_head() } zpool_expand_003_neg_body() { - atf_fail "This test causes a panic on FreeBSD" - atf_expect_fail 'BUG26166 cannot create pools on zvols' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_expand.cfg + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_expand_003_neg.ksh || atf_fail "Testcase failed" }