From owner-svn-src-projects@freebsd.org  Wed Dec 16 20:12:00 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
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 40762A49CB7
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 16 Dec 2015 20:12:00 +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 F2E041C11;
 Wed, 16 Dec 2015 20:11:59 +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 tBGKBwda059533;
 Wed, 16 Dec 2015 20:11:58 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGKBw4h059532;
 Wed, 16 Dec 2015 20:11:58 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201512162011.tBGKBw4h059532@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 16 Dec 2015 20:11:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292358 -
 projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb
X-SVN-Group: projects
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.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 20:12:00 -0000

Author: asomers
Date: Wed Dec 16 20:11:58 2015
New Revision: 292358
URL: https://svnweb.freebsd.org/changeset/base/292358

Log:
  Fix the zdb test, since zdb now takes the -o option
  
  Or at least, it will take that option once I upstream the relevant changeset.
  
  Submitted by:	Will
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh	Wed Dec 16 20:05:29 2015	(r292357)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_001_neg.ksh	Wed Dec 16 20:11:58 2015	(r292358)
@@ -67,7 +67,7 @@ set -A args "create" "add" "destroy" "im
     "add mirror fakepool" "add raidz fakepool" \
     "add raidz1 fakepool" "add raidz2 fakepool" \
     "setvprop" "blah blah" "-%" "--?" "-*" "-=" \
-    "-a" "-f" "-g" "-h" "-j" "-k" "-m" "-n" "-o" "-p" "-p /tmp" \
+    "-a" "-f" "-g" "-h" "-j" "-k" "-m" "-n" "-p" "-p /tmp" \
     "-q" "-r" "-t" "-w" "-x" "-y" "-z" \
     "-D" "-E" "-G" "-H" "-I" "-J" "-K" "-M" \
     "-N" "-Q" "-T" "-V" "-W"