From owner-freebsd-testing@FreeBSD.ORG Mon Jan 27 10:41:25 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F83D1F0; Mon, 27 Jan 2014 10:41:25 +0000 (UTC) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com [IPv6:2607:f8b0:400e:c03::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 46284187E; Mon, 27 Jan 2014 10:41:25 +0000 (UTC) Received: by mail-pa0-f51.google.com with SMTP id ld10so5732296pab.24 for ; Mon, 27 Jan 2014 02:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:subject:date:message-id:cc:to:mime-version; bh=Wc0AprS/aU1v2PVQZLWD9sRSbyhxYFEtEMOYEmQPk2k=; b=YmUon6GhBeGUrN9BzblXFI1p5yZ6wDBbZLlOfoHmzzuwN8pEw2K6ZB1PM3B7qArTVa W33y6gnSpJfETvdDRrRRrEyWBAJdBhjj+ONLxVJBQFYyyNfhWXUaX708LH7ynh4Dg3dH RTzkjoY4JCo9McEcnPGee8bmLWVU7GCqqskLnopBzH1dsEBTWDbZQ3uA+Y5sKI1ncJOs 1qfXbTAuXFiroigO0kd3J6toI6zZydPQJszu9tydj0VhQZSvHhD3scdAVNI90Vb0mX2m GVujQIAvxjUSAWnWZL9XOXRkhV8MOFxzCn+33bv9IBZJTrZz+JchKzaflHqzj7uHRhW0 osWw== X-Received: by 10.69.26.228 with SMTP id jb4mr29095725pbd.83.1390819283071; Mon, 27 Jan 2014 02:41:23 -0800 (PST) Received: from [192.168.20.5] (c-50-181-163-89.hsd1.wa.comcast.net. [50.181.163.89]) by mx.google.com with ESMTPSA id pe3sm30701347pbc.23.2014.01.27.02.41.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 02:41:21 -0800 (PST) From: Garrett Cooper Content-Type: multipart/mixed; boundary="Apple-Mail=_A4C011ED-3BA7-4DC3-B7BC-898681601A22" Subject: [PATCH] Integrate pjdfstest into the build Date: Mon, 27 Jan 2014 02:41:18 -0800 Message-Id: <94D3F60A-1E12-418B-8313-E43C93878B95@gmail.com> To: Julio Merino Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) X-Mailer: Apple Mail (2.1827) Cc: freebsd-testing@FreeBSD.org, Pawel Jakub Dawidek X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2014 10:41:25 -0000 --Apple-Mail=_A4C011ED-3BA7-4DC3-B7BC-898681601A22 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi all, The attached patch integrates pjdfstest into the build. It also = simplifies some logic in tests/sys/Makefile when copying Kyuafile. Thanks! -Garrett= --Apple-Mail=_A4C011ED-3BA7-4DC3-B7BC-898681601A22 Content-Disposition: attachment; filename=integrate-pjdfstest-into-test.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="integrate-pjdfstest-into-test.patch" Content-Transfer-Encoding: 7bit Index: etc/mtree/BSD.tests.dist =================================================================== --- etc/mtree/BSD.tests.dist (revision 261208) +++ etc/mtree/BSD.tests.dist (working copy) @@ -81,6 +81,40 @@ sys kern .. + pjdfstest + tests + chflags + .. + chmod + .. + chown + .. + ftruncate + .. + granular + .. + link + .. + mkdir + .. + mkfifo + .. + mknod + .. + open + .. + rename + .. + rmdir + .. + symlink + .. + truncate + .. + unlink + .. + .. + .. .. usr.bin atf Index: tests/sys/Makefile =================================================================== --- tests/sys/Makefile (revision 261208) +++ tests/sys/Makefile (working copy) @@ -2,13 +2,13 @@ .include +.PATH: ${.CURDIR}/.. + +TESTS_SUBDIRS+= pjdfstest + SUBDIR= kern TESTSDIR= ${TESTSBASE}/sys KYUAFILE= yes -CLEANFILES+= Kyuafile -Kyuafile: ${.CURDIR}/../Kyuafile - cp -f ${.CURDIR}/../Kyuafile . - .include Index: tests/sys/pjdfstest/Makefile =================================================================== --- tests/sys/pjdfstest/Makefile (revision 0) +++ tests/sys/pjdfstest/Makefile (working copy) @@ -0,0 +1,21 @@ +SUBDIR= pjdfstest + +TESTS_SUBDIRS+= tests + +TESTSDIR= ${TESTSBASE}/sys/pjdfstest + +KYUAFILE= yes + +.PATH: ${.CURDIR}/../../ + +test: .PHONY +.if defined(PJDFSTEST_I_KNOW_WHAT_I_AM_DOING) + cd ${.CURDIR}/tests && make ${.TARGET} +.else + @echo "Executing the pjdfstest from make test is potentially a really bad idea." + @echo + @echo "Call make test again like 'make PJDFSTEST_I_KNOW_WHAT_I_AM_DOING=1 test'" + @echo "if you want to give this a shot." +.endif + +.include Index: tests/sys/pjdfstest/pjdfstest/Makefile =================================================================== --- tests/sys/pjdfstest/pjdfstest/Makefile (revision 0) +++ tests/sys/pjdfstest/pjdfstest/Makefile (working copy) @@ -0,0 +1,18 @@ +TOP= ${.CURDIR:H:H:H:H} + +.PATH: ${TOP}/tools/regression/pjdfstest + +FILES= LICENSE \ + README \ + +BINDIR= ${TESTSBASE}/sys/pjdfstest +PROG= pjdfstest +NO_MAN= + +CFLAGS= -D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS +CFLAGS+= -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT +CFLAGS+= -DHAS_CONNECTAT + +WARNS?= 6 + +.include Index: tests/sys/pjdfstest/tests/Makefile =================================================================== --- tests/sys/pjdfstest/tests/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/Makefile (working copy) @@ -0,0 +1,28 @@ +TOP= ${.CURDIR:H:H:H:H} + +.PATH: ${TOP}/tools/regression/pjdfstest/tests + +TESTSDIR= ${TESTSBASE}/sys/pjdfstest/tests + +SCRIPTSDIR= ${TESTSDIR} +SCRIPTS+= conf +SCRIPTS+= misc.sh +SCRIPTSNAME_misc.sh= misc.sh + +TESTS_SUBDIRS+= chflags +TESTS_SUBDIRS+= chmod +TESTS_SUBDIRS+= chown +TESTS_SUBDIRS+= ftruncate +TESTS_SUBDIRS+= granular +TESTS_SUBDIRS+= link +TESTS_SUBDIRS+= mkdir +TESTS_SUBDIRS+= mkfifo +TESTS_SUBDIRS+= mknod +TESTS_SUBDIRS+= open +TESTS_SUBDIRS+= rename +TESTS_SUBDIRS+= rmdir +TESTS_SUBDIRS+= symlink +TESTS_SUBDIRS+= truncate +TESTS_SUBDIRS+= unlink + +.include Index: tests/sys/pjdfstest/tests/Makefile.inc =================================================================== --- tests/sys/pjdfstest/tests/Makefile.inc (revision 0) +++ tests/sys/pjdfstest/tests/Makefile.inc (working copy) @@ -0,0 +1,9 @@ +TOP= ${.CURDIR:H:H:H:H:H} + +.PATH: ${TOP}/tools/regression/pjdfstest/tests/${.CURDIR:T} + +TESTSDIR= ${TESTSBASE}/sys/pjdfstest/tests/${.CURDIR:T} + +.for _T in ${TAP_TESTS_SH} +TAP_TESTS_SH_SRC_${_T}= ${_T}.t +.endfor Index: tests/sys/pjdfstest/tests/chflags/Makefile =================================================================== --- tests/sys/pjdfstest/tests/chflags/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/chflags/Makefile (working copy) @@ -0,0 +1,16 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 + +.include Index: tests/sys/pjdfstest/tests/chmod/Makefile =================================================================== --- tests/sys/pjdfstest/tests/chmod/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/chmod/Makefile (working copy) @@ -0,0 +1,15 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 + +.include Index: tests/sys/pjdfstest/tests/chown/Makefile =================================================================== --- tests/sys/pjdfstest/tests/chown/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/chown/Makefile (working copy) @@ -0,0 +1,13 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 + +.include Index: tests/sys/pjdfstest/tests/ftruncate/Makefile =================================================================== --- tests/sys/pjdfstest/tests/ftruncate/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/ftruncate/Makefile (working copy) @@ -0,0 +1,3 @@ +TAP_TESTS_SH+= 00 + +.include Index: tests/sys/pjdfstest/tests/granular/Makefile =================================================================== --- tests/sys/pjdfstest/tests/granular/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/granular/Makefile (working copy) @@ -0,0 +1,8 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 + +.include Index: tests/sys/pjdfstest/tests/link/Makefile =================================================================== --- tests/sys/pjdfstest/tests/link/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/link/Makefile (working copy) @@ -0,0 +1,20 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 +TAP_TESTS_SH+= 14 +TAP_TESTS_SH+= 15 +TAP_TESTS_SH+= 16 +TAP_TESTS_SH+= 17 + +.include Index: tests/sys/pjdfstest/tests/mkdir/Makefile =================================================================== --- tests/sys/pjdfstest/tests/mkdir/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/mkdir/Makefile (working copy) @@ -0,0 +1,15 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 + +.include Index: tests/sys/pjdfstest/tests/mkfifo/Makefile =================================================================== --- tests/sys/pjdfstest/tests/mkfifo/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/mkfifo/Makefile (working copy) @@ -0,0 +1,15 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 + +.include Index: tests/sys/pjdfstest/tests/mknod/Makefile =================================================================== --- tests/sys/pjdfstest/tests/mknod/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/mknod/Makefile (working copy) @@ -0,0 +1,14 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 + +.include Index: tests/sys/pjdfstest/tests/open/Makefile =================================================================== --- tests/sys/pjdfstest/tests/open/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/open/Makefile (working copy) @@ -0,0 +1,27 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 +TAP_TESTS_SH+= 14 +TAP_TESTS_SH+= 15 +TAP_TESTS_SH+= 16 +TAP_TESTS_SH+= 17 +TAP_TESTS_SH+= 18 +TAP_TESTS_SH+= 19 +TAP_TESTS_SH+= 20 +TAP_TESTS_SH+= 21 +TAP_TESTS_SH+= 22 +TAP_TESTS_SH+= 23 +TAP_TESTS_SH+= 24 + +.include Index: tests/sys/pjdfstest/tests/rename/Makefile =================================================================== --- tests/sys/pjdfstest/tests/rename/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/rename/Makefile (working copy) @@ -0,0 +1,24 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 +TAP_TESTS_SH+= 14 +TAP_TESTS_SH+= 15 +TAP_TESTS_SH+= 16 +TAP_TESTS_SH+= 17 +TAP_TESTS_SH+= 18 +TAP_TESTS_SH+= 19 +TAP_TESTS_SH+= 20 +TAP_TESTS_SH+= 21 + +.include Index: tests/sys/pjdfstest/tests/rmdir/Makefile =================================================================== --- tests/sys/pjdfstest/tests/rmdir/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/rmdir/Makefile (working copy) @@ -0,0 +1,18 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 +TAP_TESTS_SH+= 14 +TAP_TESTS_SH+= 15 + +.include Index: tests/sys/pjdfstest/tests/symlink/Makefile =================================================================== --- tests/sys/pjdfstest/tests/symlink/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/symlink/Makefile (working copy) @@ -0,0 +1,15 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 + +.include Index: tests/sys/pjdfstest/tests/truncate/Makefile =================================================================== --- tests/sys/pjdfstest/tests/truncate/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/truncate/Makefile (working copy) @@ -0,0 +1,17 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 +TAP_TESTS_SH+= 14 + +.include Index: tests/sys/pjdfstest/tests/unlink/Makefile =================================================================== --- tests/sys/pjdfstest/tests/unlink/Makefile (revision 0) +++ tests/sys/pjdfstest/tests/unlink/Makefile (working copy) @@ -0,0 +1,16 @@ +TAP_TESTS_SH+= 00 +TAP_TESTS_SH+= 01 +TAP_TESTS_SH+= 02 +TAP_TESTS_SH+= 03 +TAP_TESTS_SH+= 04 +TAP_TESTS_SH+= 05 +TAP_TESTS_SH+= 06 +TAP_TESTS_SH+= 07 +TAP_TESTS_SH+= 08 +TAP_TESTS_SH+= 09 +TAP_TESTS_SH+= 10 +TAP_TESTS_SH+= 11 +TAP_TESTS_SH+= 12 +TAP_TESTS_SH+= 13 + +.include --Apple-Mail=_A4C011ED-3BA7-4DC3-B7BC-898681601A22--