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>
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to