From owner-svn-src-all@FreeBSD.ORG  Mon Nov  3 06:07:56 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 250BB647;
 Mon,  3 Nov 2014 06:07:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 115D3C45;
 Mon,  3 Nov 2014 06:07:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA367tcT089369;
 Mon, 3 Nov 2014 06:07:55 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA367tbj089368;
 Mon, 3 Nov 2014 06:07:55 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411030607.sA367tbj089368@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 3 Nov 2014 06:07:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274011 - head/usr.sbin/pw/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Nov 2014 06:07:56 -0000

Author: ngie
Date: Mon Nov  3 06:07:55 2014
New Revision: 274011
URL: https://svnweb.freebsd.org/changeset/base/274011

Log:
  Integrate usr.sbin/useradd/t_useradd.sh from NetBSD into FreeBSD as pw_test
  
  - Suffix useradd/userdel commands with pw
  - Remove the atf_expect_fail for bin/39546
  
  Phabric: D921
  Reviewed by: brd
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/usr.sbin/pw/tests/Makefile

Modified: head/usr.sbin/pw/tests/Makefile
==============================================================================
--- head/usr.sbin/pw/tests/Makefile	Mon Nov  3 05:36:35 2014	(r274010)
+++ head/usr.sbin/pw/tests/Makefile	Mon Nov  3 06:07:55 2014	(r274011)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/useradd
+.PATH: ${TESTSRC}
+
 TESTSDIR=	${TESTSBASE}/usr.sbin/pw
 
 ATF_TESTS_SH=	pw_delete pw_modify
@@ -7,4 +10,12 @@ ATF_TESTS_SH=	pw_delete pw_modify
 FILES=		group helper_functions.shin master.passwd
 FILESDIR=       ${TESTSDIR}
 
+ATF_TESTS_SH+=	pw_test
+# - user{add,del} does not exist on FreeBSD; use pw user{add,del} instead
+# - The command passes on FreeBSD
+ATF_TESTS_SH_SED_pw_test=	-e 's/useradd /pw useradd /'
+ATF_TESTS_SH_SED_pw_test+=	-e 's/userdel /pw userdel /'
+ATF_TESTS_SH_SED_pw_test+=	-e '/atf_expect_fail "PR bin\/39546"/d'
+ATF_TESTS_SH_SRC_pw_test=	t_useradd.sh
+
 .include <bsd.test.mk>