From owner-freebsd-testing@FreeBSD.ORG Sun Jan 26 08:21:11 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 CE0EB6A2 for ; Sun, 26 Jan 2014 08:21:11 +0000 (UTC) Received: from mail-pd0-x22a.google.com (mail-pd0-x22a.google.com [IPv6:2607:f8b0:400e:c02::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A0DE41392 for ; Sun, 26 Jan 2014 08:21:11 +0000 (UTC) Received: by mail-pd0-f170.google.com with SMTP id p10so4688518pdj.1 for ; Sun, 26 Jan 2014 00:21:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=NvrFDvU525SEtgtRTyIrdA2crnsGpYp3SqL7WXL8mfM=; b=linSXr5Zj1lR96lSUGrgCYxLNDXXymb+BWonsNtxUl8QYhI26I+27PXDNEsyfeZMl9 rBX9I/GS9qjWCwRJmwG3fm6sSg8xCz1QYZff3G4B4g6jrLnVdcIPgqmnPiKpHI+z6+7x xYUInpJpgewYwYVakai8I1AVO7bS9xfDkFZlz8GxU6NY0WR8EJzN6R1WRLBp4lqIwA4N /MJzuSEax/HDKGXo1uULjv06FsvVd3K2BuYclh4EzRaRixjGwNQD8FEiUWqDbQyB6T3C oPrM9RITh3ljLL/ZtvkGc8idMvsB5tShb3+HkwZA8xrvtVz5WqUEPszaSWZ1b5QN+WNf v97w== X-Received: by 10.68.139.100 with SMTP id qx4mr1646169pbb.144.1390724471157; Sun, 26 Jan 2014 00:21:11 -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 vx10sm53683128pac.17.2014.01.26.00.21.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 00:21:10 -0800 (PST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: [PATCH] convert /bin/sh tests over to ATF From: Garrett Cooper In-Reply-To: <20140124162759.GB90996@stack.nl> Date: Sun, 26 Jan 2014 00:21:07 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20140124162759.GB90996@stack.nl> To: Jilles Tjoelker X-Mailer: Apple Mail (2.1827) Cc: Julio Merino , freebsd-testing@FreeBSD.org 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: Sun, 26 Jan 2014 08:21:11 -0000 On Jan 24, 2014, at 8:27 AM, Jilles Tjoelker wrote: > On Mon, Jan 20, 2014 at 08:44:58AM -0800, Garrett Cooper wrote: >> Also, I added some functionality so the tests expect failures on >> certain versions of FreeBSD due to missing functionality or >> conformance modifications (see the .valid_osreldate files). >=20 > I think this part is a bit too simplistic and inflexible. I have = always > dealt with changes affecting the tests by MFCing the changes to the > tests along with the changes to sh itself, and this has worked well > enough. On the other hand, I also run -current's sh and tests on my > -stable machine, without installing the tests (and often also without > installing the new sh). Therefore, the osreldate of the machine does = not > imply that the sh is also of that version. >=20 > There are also changes like r222684 that need an adjustment to the = tests > which are hard to handle properly using a .valid_osreldate file. Fair enough. Long story short, when I wrote this I was still working at = EMC on a FreeBSD port project where we were porting = revision-by-revision, so in order for the tests to not fail [so much], = it helped to write in these checks. I agree though, this shouldn=92t hit = mainline FreeBSD at all (will yank it). > There may be some point in marking tests that are supposed to work on > any POSIX-compliant sh and ones that are inherently FreeBSD-specific, = or > possibly more granular. However, this would be most useful when = someone > who cares about another sh implementation works on it. Ok. Thanks! -Garrett= From owner-freebsd-testing@FreeBSD.ORG Sun Jan 26 08:21:50 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12C9C6B1 for ; Sun, 26 Jan 2014 08:21:50 +0000 (UTC) Received: from mail-pd0-x233.google.com (mail-pd0-x233.google.com [IPv6:2607:f8b0:400e:c02::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D82371395 for ; Sun, 26 Jan 2014 08:21:49 +0000 (UTC) Received: by mail-pd0-f179.google.com with SMTP id q10so4653160pdj.38 for ; Sun, 26 Jan 2014 00:21:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=LszM68+gxguSEFkoLPK9+aKGrPOroaI6z9aqWxUkIwg=; b=xU6Nln+/AIaDjaUHhpQ22G4PcKU0Ze9EjDsGL3B/j6fDBLfN1XVWkmNxs3fLGgcZMO H5LrpoSAuK4YYN3cNlltjRBbLCJWzhfninJlF33ebsTo1Z3mDBuBOWcoubB0+/PZvSor IH02gYfqPcoLS006hXs22NlcwL+Jp8j64Pu1ortgdw1FyYlGzhbiw95bxyoSOcEqRsCA yh+gc+c3FhJGInawT+n12/2HpJVjOizfrnOKc29C+TuNGWJ1wdgDfquVuLaduBlJKiLI nqQWNNdKYwzRcOexQTQEP+X1njrRBJX9+CsrlzzW9RIfhVZJLgcpu8rLkZql2XNUzPtl BfeQ== X-Received: by 10.66.149.7 with SMTP id tw7mr23932305pab.72.1390724509557; Sun, 26 Jan 2014 00:21:49 -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 vx10sm53683128pac.17.2014.01.26.00.21.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 00:21:49 -0800 (PST) Content-Type: text/plain; charset=iso-8859-1 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: [PATCH] convert /bin/sh tests over to ATF From: Garrett Cooper In-Reply-To: Date: Sun, 26 Jan 2014 00:21:47 -0800 Content-Transfer-Encoding: 7bit Message-Id: <0A68C9FE-6A3A-4DCF-92A9-A506D7581D69@gmail.com> References: <20140124162759.GB90996@stack.nl> To: Julio Merino X-Mailer: Apple Mail (2.1827) Cc: freebsd-testing@freebsd.org, Jilles Tjoelker 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: Sun, 26 Jan 2014 08:21:50 -0000 On Jan 24, 2014, at 3:33 PM, Julio Merino wrote: > On Fri, Jan 24, 2014 at 11:27 AM, Jilles Tjoelker wrote: >> >> There may be some point in marking tests that are supposed to work on >> any POSIX-compliant sh and ones that are inherently FreeBSD-specific, or >> possibly more granular. However, this would be most useful when someone >> who cares about another sh implementation works on it. > > That's a worthy goal, but only if the test suite was an "external > component" that you shipped outside of FreeBSD and was easily > applicable to other systems. > > As it is now, the test suite lives in the FreeBSD tree and therefore > it can be considered to be FreeBSD-specific. Special-casing things out > as only applying to FreeBSD will be difficult to maintain and make > little sense in the current context. > > Now... all this can (and should) easily turn into the more generic > discussion of: how to define tests that can be shared across the > various BSDs and how to better maintain them? I currently have no > answer for that, but it's a pretty large topic to cover. Indeed.. -Garrett From owner-freebsd-testing@FreeBSD.ORG Mon Jan 27 10:02:44 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 D91A0411 for ; Mon, 27 Jan 2014 10:02:44 +0000 (UTC) Received: from mail-pb0-x233.google.com (mail-pb0-x233.google.com [IPv6:2607:f8b0:400e:c01::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A452E1551 for ; Mon, 27 Jan 2014 10:02:44 +0000 (UTC) Received: by mail-pb0-f51.google.com with SMTP id un15so5709953pbc.10 for ; Mon, 27 Jan 2014 02:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=3DEb8X0wNFKZNn4y37rDlW1uNWsB+7laah3HjDG+U+Q=; b=l1PRv5KrJ+Fyz3OH0HCrZiO4uNOhYjJ16JzYGw2cXxT/GbsQ4NQFFFmVf02B9YJPOz EjsNQ5d/Mp35etkmnSt5KFZtrG6mrbM1URTD0L9v718Ox/oM85x7lRbNRKXGg1tQ4xmr kZ3idGhHGjYLq5EyQ27bugROw7nzm766RBo1e90AEy0mcYffohIWjlQsRuvg0Ck78q/H qR5YufPkcaHsiR8eTzy+By2zAZxsI1449ejdzH4+6dJKGpdygIozvUHJRg2bom+cchGO QcSWttmCk6E5aQ5Fddy+bdFoQKckGzEVHnY8m9TfwY4GGH0TJjg8AhdjSpUdZdC8IniL 8frw== X-Received: by 10.68.231.169 with SMTP id th9mr28997193pbc.113.1390816964052; Mon, 27 Jan 2014 02:02:44 -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 cz3sm30403375pbc.9.2014.01.27.02.02.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 02:02:43 -0800 (PST) Content-Type: multipart/mixed; boundary="Apple-Mail=_39BFED05-3937-4398-9BFF-3FFE09BCF50F" Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: [PATCH v2] convert /bin/sh tests over to ATF From: Garrett Cooper In-Reply-To: <0A68C9FE-6A3A-4DCF-92A9-A506D7581D69@gmail.com> Date: Mon, 27 Jan 2014 02:02:39 -0800 Message-Id: <96373EF8-77EA-4AA6-8422-63881C32E455@gmail.com> References: <20140124162759.GB90996@stack.nl> <0A68C9FE-6A3A-4DCF-92A9-A506D7581D69@gmail.com> To: Julio Merino X-Mailer: Apple Mail (2.1827) Cc: freebsd-testing@freebsd.org, Jilles Tjoelker 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:02:44 -0000 --Apple-Mail=_39BFED05-3937-4398-9BFF-3FFE09BCF50F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 Hi all, Here=92s the next patch for converting bin/sh/tests over to ATF. = I=92ve tried to incorporate all input from folks about simplifying the = integration scripts and removing valid_osreldate functionality. Thanks! -Garrett --Apple-Mail=_39BFED05-3937-4398-9BFF-3FFE09BCF50F Content-Disposition: attachment; filename=convert-bin-sh-over-to-atf.patch Content-Type: application/octet-stream; name="convert-bin-sh-over-to-atf.patch" Content-Transfer-Encoding: 7bit diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile index f6ddb8a..d66788f 100644 --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -4,15 +4,6 @@ TESTSDIR= ${TESTSBASE}/bin/sh -TAP_TESTS_SH= legacy_test -TAP_TESTS_SH_SED_legacy_test= -e 's,__SH__,/bin/sh,g' -# Some tests in here are silently not run when the tests are executed as -# root. Explicitly tell Kyua to drop privileges. -# -# TODO(jmmv): Kyua needs to do this by default, not only when explicitly -# requested. See https://code.google.com/p/kyua/issues/detail?id=6 -TEST_METADATA.legacy_test+= required_user="unprivileged" +ATF_TESTS_SUBDIRS+= builtins errors execution expansion parameters parser set-e -SUBDIR+= builtins errors execution expansion parameters parser set-e - -.include +.include diff --git a/bin/sh/tests/Makefile.inc b/bin/sh/tests/Makefile.inc new file mode 100644 index 0000000..9685be4 --- /dev/null +++ b/bin/sh/tests/Makefile.inc @@ -0,0 +1,15 @@ +# $FreeBSD$ + +CLEANFILES= functional_test.sh + +TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} + +_FILES!= cd ${.CURDIR} && find . \( -type f -and \! -name Makefile\* \) | \ + sed -e 's,^\./,,g' +FILES+= ${_FILES} +FILESDIR= ${TESTSDIR} + +functional_test.sh: ${.CURDIR}/../functional_test + cp ${.ALLSRC} ${.TARGET} + +ATF_TESTS_SH+= functional_test diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index 3b1d24b..66e668c 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -1,147 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/builtins -KYUAFILE= no - -FILES= alias.0 alias.0.stdout -FILES+= alias.1 alias.1.stderr -FILES+= alias3.0 alias3.0.stdout -FILES+= alias4.0 -FILES+= break1.0 -FILES+= break2.0 break2.0.stdout -FILES+= break3.0 -FILES+= break4.4 -FILES+= break5.4 -FILES+= builtin1.0 -FILES+= case1.0 -FILES+= case2.0 -FILES+= case3.0 -FILES+= case4.0 -FILES+= case5.0 -FILES+= case6.0 -FILES+= case7.0 -FILES+= case8.0 -FILES+= case9.0 -FILES+= case10.0 -FILES+= case11.0 -FILES+= case12.0 -FILES+= case13.0 -FILES+= case14.0 -FILES+= case15.0 -FILES+= case16.0 -FILES+= case17.0 -FILES+= case18.0 -FILES+= case19.0 -FILES+= cd1.0 -FILES+= cd2.0 -FILES+= cd3.0 -FILES+= cd4.0 -FILES+= cd5.0 -FILES+= cd6.0 -FILES+= cd7.0 -FILES+= cd8.0 -FILES+= command1.0 -FILES+= command2.0 -FILES+= command3.0 -FILES+= command3.0.stdout -FILES+= command4.0 -FILES+= command5.0 -FILES+= command5.0.stdout -FILES+= command6.0 -FILES+= command6.0.stdout -FILES+= command7.0 -FILES+= command8.0 -FILES+= command9.0 -FILES+= command10.0 -FILES+= command11.0 -FILES+= command12.0 -FILES+= dot1.0 -FILES+= dot2.0 -FILES+= dot3.0 -FILES+= dot4.0 -FILES+= eval1.0 -FILES+= eval2.0 -FILES+= eval3.0 -FILES+= eval4.0 -FILES+= eval5.0 -FILES+= eval6.0 -FILES+= exec1.0 -FILES+= exec2.0 -FILES+= exit1.0 -FILES+= exit2.8 -FILES+= exit3.0 -FILES+= export1.0 -FILES+= fc1.0 -FILES+= fc2.0 -FILES+= for1.0 -FILES+= for2.0 -FILES+= for3.0 -FILES+= getopts1.0 getopts1.0.stdout -FILES+= getopts2.0 getopts2.0.stdout -FILES+= hash1.0 hash1.0.stdout -FILES+= hash2.0 hash2.0.stdout -FILES+= hash3.0 hash3.0.stdout -FILES+= hash4.0 -FILES+= jobid1.0 -FILES+= jobid2.0 -FILES+= lineno.0 lineno.0.stdout -FILES+= local1.0 -FILES+= local2.0 -FILES+= local3.0 -FILES+= local4.0 -FILES+= locale1.0 -FILES+= printf1.0 -FILES+= printf2.0 -FILES+= printf3.0 -FILES+= printf4.0 -FILES+= read1.0 read1.0.stdout -FILES+= read2.0 -FILES+= read3.0 read3.0.stdout -FILES+= read4.0 read4.0.stdout -FILES+= read5.0 -FILES+= read6.0 -FILES+= read7.0 -FILES+= return1.0 -FILES+= return2.1 -FILES+= return3.1 -FILES+= return4.0 -FILES+= return5.0 -FILES+= return6.4 -FILES+= return7.4 -FILES+= return8.0 -FILES+= set1.0 -FILES+= set2.0 -FILES+= trap1.0 -FILES+= trap10.0 -FILES+= trap11.0 -FILES+= trap12.0 -FILES+= trap13.0 -FILES+= trap14.0 -FILES+= trap2.0 -FILES+= trap3.0 -FILES+= trap4.0 -FILES+= trap5.0 -FILES+= trap6.0 -FILES+= trap7.0 -FILES+= trap8.0 -FILES+= trap9.0 -FILES+= type1.0 type1.0.stderr -FILES+= type2.0 -FILES+= type3.0 -FILES+= unalias.0 -FILES+= var-assign.0 -FILES+= var-assign2.0 -FILES+= wait1.0 -FILES+= wait2.0 -FILES+= wait3.0 -FILES+= wait4.0 -FILES+= wait5.0 -FILES+= wait6.0 -FILES+= wait7.0 -FILES+= wait8.0 -FILES+= wait9.127 -FILES+= wait10.0 - -.include +.include diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile index 9f8b0f2..66e668c 100644 --- a/bin/sh/tests/errors/Makefile +++ b/bin/sh/tests/errors/Makefile @@ -1,30 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/errors -KYUAFILE= no - -FILES= assignment-error1.0 -FILES+= assignment-error2.0 -FILES+= backquote-error1.0 -FILES+= backquote-error2.0 -FILES+= bad-binary1.126 -FILES+= bad-keyword1.0 -FILES+= bad-parm-exp1.0 -FILES+= bad-parm-exp2.2 bad-parm-exp2.2.stderr -FILES+= bad-parm-exp3.2 bad-parm-exp3.2.stderr -FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr -FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr -FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr -FILES+= option-error.0 -FILES+= redirection-error.0 -FILES+= redirection-error2.2 -FILES+= redirection-error3.0 -FILES+= redirection-error4.0 -FILES+= redirection-error5.0 -FILES+= redirection-error6.0 -FILES+= redirection-error7.0 -FILES+= write-error1.0 - -.include +.include diff --git a/bin/sh/tests/errors/bad-parm-exp2.2.stderr b/bin/sh/tests/errors/bad-parm-exp2.2.stderr index d027a5a..1135af0 100644 --- a/bin/sh/tests/errors/bad-parm-exp2.2.stderr +++ b/bin/sh/tests/errors/bad-parm-exp2.2.stderr @@ -1 +1 @@ -./errors/bad-parm-exp2.2: ${}: Bad substitution +./bad-parm-exp2.2: ${}: Bad substitution diff --git a/bin/sh/tests/errors/bad-parm-exp3.2.stderr b/bin/sh/tests/errors/bad-parm-exp3.2.stderr index ef40251..b28fdff 100644 --- a/bin/sh/tests/errors/bad-parm-exp3.2.stderr +++ b/bin/sh/tests/errors/bad-parm-exp3.2.stderr @@ -1 +1 @@ -./errors/bad-parm-exp3.2: ${foo/}: Bad substitution +./bad-parm-exp3.2: ${foo/}: Bad substitution diff --git a/bin/sh/tests/errors/bad-parm-exp4.2.stderr b/bin/sh/tests/errors/bad-parm-exp4.2.stderr index 89bd80f..1487b61 100644 --- a/bin/sh/tests/errors/bad-parm-exp4.2.stderr +++ b/bin/sh/tests/errors/bad-parm-exp4.2.stderr @@ -1 +1 @@ -./errors/bad-parm-exp4.2: ${foo:@...}: Bad substitution +./bad-parm-exp4.2: ${foo:@...}: Bad substitution diff --git a/bin/sh/tests/errors/bad-parm-exp5.2.stderr b/bin/sh/tests/errors/bad-parm-exp5.2.stderr index 89b1997..2138c2e 100644 --- a/bin/sh/tests/errors/bad-parm-exp5.2.stderr +++ b/bin/sh/tests/errors/bad-parm-exp5.2.stderr @@ -1 +1 @@ -./errors/bad-parm-exp5.2: ${/}: Bad substitution +./bad-parm-exp5.2: ${/}: Bad substitution diff --git a/bin/sh/tests/errors/bad-parm-exp6.2.stderr b/bin/sh/tests/errors/bad-parm-exp6.2.stderr index dbf14b5..ba3b671 100644 --- a/bin/sh/tests/errors/bad-parm-exp6.2.stderr +++ b/bin/sh/tests/errors/bad-parm-exp6.2.stderr @@ -1 +1 @@ -./errors/bad-parm-exp6.2: ${foo...}: Bad substitution +./bad-parm-exp6.2: ${foo...}: Bad substitution diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile index 302d0d8..66e668c 100644 --- a/bin/sh/tests/execution/Makefile +++ b/bin/sh/tests/execution/Makefile @@ -1,53 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/execution -KYUAFILE= no - -FILES= bg1.0 -FILES+= bg2.0 -FILES+= bg3.0 -FILES+= bg4.0 -FILES+= bg5.0 -FILES+= bg6.0 bg6.0.stdout -FILES+= bg7.0 -FILES+= bg8.0 -FILES+= bg9.0 -FILES+= bg10.0 bg10.0.stdout -FILES+= fork1.0 -FILES+= fork2.0 -FILES+= fork3.0 -FILES+= func1.0 -FILES+= func2.0 -FILES+= func3.0 -FILES+= hash1.0 -FILES+= int-cmd1.0 -FILES+= killed1.0 -FILES+= killed2.0 -FILES+= not1.0 -FILES+= not2.0 -FILES+= path1.0 -FILES+= redir1.0 -FILES+= redir2.0 -FILES+= redir3.0 -FILES+= redir4.0 -FILES+= redir5.0 -FILES+= redir6.0 -FILES+= redir7.0 -FILES+= set-n1.0 -FILES+= set-n2.0 -FILES+= set-n3.0 -FILES+= set-n4.0 -FILES+= set-x1.0 -FILES+= set-x2.0 -FILES+= set-x3.0 -FILES+= shellproc1.0 -FILES+= subshell1.0 subshell1.0.stdout -FILES+= subshell2.0 -FILES+= subshell3.0 -FILES+= subshell4.0 -FILES+= unknown1.0 -FILES+= var-assign1.0 - -.include +.include diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile index bd24319..66e668c 100644 --- a/bin/sh/tests/expansion/Makefile +++ b/bin/sh/tests/expansion/Makefile @@ -1,86 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/expansion -KYUAFILE= no - -FILES= arith1.0 -FILES+= arith2.0 -FILES+= arith3.0 -FILES+= arith4.0 -FILES+= arith5.0 -FILES+= arith6.0 -FILES+= arith7.0 -FILES+= arith8.0 -FILES+= arith9.0 -FILES+= arith10.0 -FILES+= arith11.0 -FILES+= arith12.0 -FILES+= arith13.0 -FILES+= assign1.0 -FILES+= cmdsubst1.0 -FILES+= cmdsubst2.0 -FILES+= cmdsubst3.0 -FILES+= cmdsubst4.0 -FILES+= cmdsubst5.0 -FILES+= cmdsubst6.0 -FILES+= cmdsubst7.0 -FILES+= cmdsubst8.0 -FILES+= cmdsubst9.0 -FILES+= cmdsubst10.0 -FILES+= cmdsubst11.0 -FILES+= cmdsubst12.0 -FILES+= cmdsubst13.0 -FILES+= cmdsubst14.0 -FILES+= cmdsubst15.0 -FILES+= cmdsubst16.0 -FILES+= cmdsubst17.0 -FILES+= export1.0 -FILES+= export2.0 -FILES+= export3.0 -FILES+= heredoc1.0 -FILES+= heredoc2.0 -FILES+= ifs1.0 -FILES+= ifs2.0 -FILES+= ifs3.0 -FILES+= ifs4.0 -FILES+= length1.0 -FILES+= length2.0 -FILES+= length3.0 -FILES+= length4.0 -FILES+= length5.0 -FILES+= length6.0 -FILES+= length7.0 -FILES+= length8.0 -FILES+= local1.0 -FILES+= local2.0 -FILES+= pathname1.0 -FILES+= pathname2.0 -FILES+= pathname3.0 -FILES+= pathname4.0 -FILES+= plus-minus1.0 -FILES+= plus-minus2.0 -FILES+= plus-minus3.0 -FILES+= plus-minus4.0 -FILES+= plus-minus5.0 -FILES+= plus-minus6.0 -FILES+= plus-minus7.0 -FILES+= plus-minus8.0 -FILES+= question1.0 -FILES+= readonly1.0 -FILES+= set-u1.0 -FILES+= set-u2.0 -FILES+= set-u3.0 -FILES+= tilde1.0 -FILES+= tilde2.0 -FILES+= trim1.0 -FILES+= trim2.0 -FILES+= trim3.0 -FILES+= trim4.0 -FILES+= trim5.0 -FILES+= trim6.0 -FILES+= trim7.0 -FILES+= trim8.0 - -.include +.include diff --git a/bin/sh/tests/functional_test b/bin/sh/tests/functional_test new file mode 100644 index 0000000..a0a84619 --- /dev/null +++ b/bin/sh/tests/functional_test @@ -0,0 +1,45 @@ +: ${SH=/bin/sh} +export SH + +cd "$(dirname $0)" + +discover_testcases() +{ + find -Es . -regex '.*\.[0-9]+' | sed -e 's,^\./,,g' +} + +testcase_generator() +{ + local tc + local tc_escaped + + tc=$1 + tc_escaped=$(echo "$tc" | \ + sed -e 's,/,_,g' -e 's,\.,__,g' -e 's,-,____,g') + + eval " +atf_test_case ${tc_escaped} +${tc_escaped}_body() { + local se=${tc}.stderr + local so=${tc}.stdout + + cd \$(atf_get_srcdir) + atf_check -s exit:${tc##*.} \\ + \$([ -f \$se ] && echo \"-e file:\$se\") \\ + \$([ -f \$so ] && echo \"-o file:\$so\") \\ + ${SH} ./${tc} +} +" + atf_add_test_case ${tc_escaped} +} + +atf_init_test_cases() +{ + testcases=$(discover_testcases) + for testcase in $testcases + do + testcase_generator $testcase + done +} + +# vim:syntax=sh diff --git a/bin/sh/tests/legacy_test.sh b/bin/sh/tests/legacy_test.sh deleted file mode 100644 index d43f5dd..0000000 --- a/bin/sh/tests/legacy_test.sh +++ /dev/null @@ -1,46 +0,0 @@ -# $FreeBSD$ - -: ${SH:="__SH__"} -export SH - -# TODO(jmmv): The Kyua TAP interface should be passing us the value of -# "srcdir" as an environment variable, just as it does with the ATF -# interface in the form of a configuration variable. For now, just try -# to guess this. -: ${TESTS_DATA:=$(dirname ${0})} - -COUNTER=1 - -do_test() { - c=${COUNTER} - COUNTER=$((COUNTER+1)) - ${SH} $1 > tmp.stdout 2> tmp.stderr - if [ $? -ne $2 ]; then - echo "not ok ${c} - ${1} # wrong exit status" - rm tmp.stdout tmp.stderr - return - fi - sed -I '' -e "s|^${TESTS_DATA}|.|" tmp.stderr - for i in stdout stderr; do - if [ -f ${1}.${i} ]; then - if ! cmp -s tmp.${i} ${1}.${i}; then - echo "not ok ${c} - ${1} # wrong output on ${i}" - rm tmp.stdout tmp.stderr - return - fi - elif [ -s tmp.${i} ]; then - echo "not ok ${c} - ${1} # wrong output on ${i}" - rm tmp.stdout tmp.stderr - return - fi - done - echo "ok ${c} - ${1}" - rm tmp.stdout tmp.stderr -} - -TESTS=$(find -Es ${TESTS_DATA} -regex ".*\.[0-9]+") -printf "1..%d\n" $(echo ${TESTS} | wc -w) - -for i in ${TESTS} ; do - do_test ${i} ${i##*.} -done diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile index fafc059..66e668c 100644 --- a/bin/sh/tests/parameters/Makefile +++ b/bin/sh/tests/parameters/Makefile @@ -1,19 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/parameters -KYUAFILE= no - -FILES= env1.0 -FILES+= exitstatus1.0 -FILES+= mail1.0 -FILES+= mail2.0 -FILES+= optind1.0 -FILES+= optind2.0 -FILES+= positional1.0 -FILES+= positional2.0 -FILES+= pwd1.0 -FILES+= pwd2.0 - -.include +.include diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile index 03650b1..66e668c 100644 --- a/bin/sh/tests/parser/Makefile +++ b/bin/sh/tests/parser/Makefile @@ -1,64 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/parser -KYUAFILE= no - -FILES= alias1.0 -FILES+= alias2.0 -FILES+= alias3.0 -FILES+= alias4.0 -FILES+= alias5.0 -FILES+= alias6.0 -FILES+= alias7.0 -FILES+= alias8.0 -FILES+= alias9.0 -FILES+= alias10.0 -FILES+= alias11.0 -FILES+= alias12.0 -FILES+= alias13.0 -FILES+= alias14.0 -FILES+= alias15.0 alias15.0.stdout -FILES+= and-pipe-not.0 -FILES+= case1.0 -FILES+= case2.0 -FILES+= dollar-quote1.0 -FILES+= dollar-quote2.0 -FILES+= dollar-quote3.0 -FILES+= dollar-quote4.0 -FILES+= dollar-quote5.0 -FILES+= dollar-quote6.0 -FILES+= dollar-quote7.0 -FILES+= dollar-quote8.0 -FILES+= dollar-quote9.0 -FILES+= dollar-quote10.0 -FILES+= dollar-quote11.0 -FILES+= empty-braces1.0 -FILES+= empty-cmd1.0 -FILES+= for1.0 -FILES+= for2.0 -FILES+= func1.0 -FILES+= func2.0 -FILES+= func3.0 -FILES+= heredoc1.0 -FILES+= heredoc2.0 -FILES+= heredoc3.0 -FILES+= heredoc4.0 -FILES+= heredoc5.0 -FILES+= heredoc6.0 -FILES+= heredoc7.0 -FILES+= heredoc8.0 -FILES+= heredoc9.0 -FILES+= heredoc10.0 -FILES+= heredoc11.0 -FILES+= no-space1.0 -FILES+= no-space2.0 -FILES+= only-redir1.0 -FILES+= only-redir2.0 -FILES+= only-redir3.0 -FILES+= only-redir4.0 -FILES+= pipe-not1.0 -FILES+= var-assign1.0 - -.include +.include diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile index 55d7917..66e668c 100644 --- a/bin/sh/tests/set-e/Makefile +++ b/bin/sh/tests/set-e/Makefile @@ -1,44 +1,3 @@ # $FreeBSD$ -.include - -FILESDIR= ${TESTSBASE}/bin/sh/set-e -KYUAFILE= no - -FILES= and1.0 -FILES+= and2.1 -FILES+= and3.0 -FILES+= and4.0 -FILES+= background1.0 -FILES+= cmd1.0 -FILES+= cmd2.1 -FILES+= elif1.0 -FILES+= elif2.0 -FILES+= eval1.0 -FILES+= eval2.1 -FILES+= for1.0 -FILES+= func1.0 -FILES+= func2.1 -FILES+= if1.0 -FILES+= if2.0 -FILES+= if3.0 -FILES+= not1.0 -FILES+= not2.0 -FILES+= or1.0 -FILES+= or2.0 -FILES+= or3.1 -FILES+= pipe1.1 -FILES+= pipe2.0 -FILES+= return1.0 -FILES+= semi1.1 -FILES+= semi2.1 -FILES+= subshell1.0 -FILES+= subshell2.1 -FILES+= until1.0 -FILES+= until2.0 -FILES+= until3.0 -FILES+= while1.0 -FILES+= while2.0 -FILES+= while3.0 - -.include +.include --Apple-Mail=_39BFED05-3937-4398-9BFF-3FFE09BCF50F-- From owner-freebsd-testing@FreeBSD.ORG Mon Jan 27 10:03:39 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B06BC429; Mon, 27 Jan 2014 10:03:39 +0000 (UTC) Received: from mail-pa0-x235.google.com (mail-pa0-x235.google.com [IPv6:2607:f8b0:400e:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 77B7F155E; Mon, 27 Jan 2014 10:03:39 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id lj1so5668674pab.26 for ; Mon, 27 Jan 2014 02:03:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=awApWi+mm4/snRNMvlb7PrSJzTaNLAWLey2KiWkwyCY=; b=zCudUOAq7+dh40jlvMjlVeYnMDB6qUD8uD9ohGQLY4vDhscv4XR1wJLIMHom2P/Cgv fNOcXvH2xY8WdBQ6pDacB4flmAl3tj/GfrHEZoUdloe0W81KAPORg5g868IeGvLJ5vXL IR578XlYczXHxN2rxx8eg3pCfwE6T9gw9PG7xkxtNz/YxRaWqKd9NECae71eh6gjiTI0 iJvrivBSUd7sqWY/ipJHuyQqEd4EnjY+MwtKvtRBvskh00YFoBnhtXkVEORPsJOUafQC 3fk5AIuSC7e+CEm2V1q9USvzVsRESbeVKeXGoWurlRDd9SYH0e8jqWGRkZtCflAOIoWA 7ZLQ== X-Received: by 10.66.149.73 with SMTP id ty9mr29506614pab.36.1390817018520; Mon, 27 Jan 2014 02:03:38 -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 cz3sm30403375pbc.9.2014.01.27.02.03.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Jan 2014 02:03:37 -0800 (PST) Content-Type: multipart/mixed; boundary="Apple-Mail=_F518CF31-AFAD-4414-BB2B-AB1861E87B42" Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: [PATCH v2] convert bin/date over to ATF From: Garrett Cooper In-Reply-To: Date: Mon, 27 Jan 2014 02:03:36 -0800 Message-Id: <4A25ADF9-3714-4006-ACB6-F8C745CB38AE@gmail.com> References: <6079AD8F-5EBB-431C-A06B-9B51E2729F5A@gmail.com> To: Julio Merino X-Mailer: Apple Mail (2.1827) Cc: freebsd-testing@freebsd.org, Giorgos Keramidas 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:03:39 -0000 --Apple-Mail=_F518CF31-AFAD-4414-BB2B-AB1861E87B42 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 The attached patch incorporates the input from Julio for = converting bin/date/tests over to ATF. Thanks! -Garrett --Apple-Mail=_F518CF31-AFAD-4414-BB2B-AB1861E87B42 Content-Disposition: attachment; filename=convert-bin-date-over-to-atf.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="convert-bin-date-over-to-atf.patch" Content-Transfer-Encoding: 7bit diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile index 540008b..cb7a39e 100644 --- a/bin/date/tests/Makefile +++ b/bin/date/tests/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ -.include - TESTSDIR= ${TESTSBASE}/bin/date -TAP_TESTS_SH= legacy_test +ATF_TESTS_SH= format_string_functional_test -.include +.include diff --git a/bin/date/tests/format_string_functional_test.sh b/bin/date/tests/format_string_functional_test.sh new file mode 100644 index 0000000..a988fbc --- /dev/null +++ b/bin/date/tests/format_string_functional_test.sh @@ -0,0 +1,559 @@ +# +# Regression tests for date(1) +# +# Submitted by Edwin Groothuis +# +# $FreeBSD$ +# + +# +# These two date/times have been chosen carefully, they +# create both the single digit and double/multidigit version of +# the values. +# +# To create a new one, make sure you are using the UTC timezone! +# + +TEST1=3222243 # 1970-02-07 07:04:03 +TEST2=1005600000 # 2001-11-12 21:11:12 + +export LC_ALL=C +export TZ=UTC + +check() +{ + local format_string exp_output_1 exp_output_2 output + + format_string=$1 + exp_output_1=$2 + exp_output_2=$3 + + # If the second sample text for formatted output has not been + # passed, assume it should match exactly the first one. + if [ -z "$exp_output_2" ]; then + exp_output_2=${exp_output_1} + fi + + output=$(date -r ${TEST1} +%${format_string}) + atf_check test "${output}" = "$exp_output_1" + + output=$(date -r ${TEST2} +%${format_string}) + atf_check test "${output}" = "$exp_output_2" +} + +# ---------------------------------------------------------------------- + +atf_test_case A +A_head() +{ + atf_set "descr" "Verifies that 'A' formatting spec works" +} +A_body() +{ + check A Saturday Monday +} + +# ---------------------------------------------------------------------- + +atf_test_case a +a_head() +{ + atf_set "descr" "Verifies that 'a' formatting spec works" +} +a_body() +{ + check a Sat Mon +} + +# ---------------------------------------------------------------------- + +atf_test_case B +B_head() +{ + atf_set "descr" "Verifies that 'B' formatting spec works" +} +B_body() +{ + check B February November +} + +# ---------------------------------------------------------------------- + +atf_test_case b +b_head() +{ + atf_set "descr" "Verifies that 'b' formatting spec works" +} +b_body() +{ + check b Feb Nov +} + +# ---------------------------------------------------------------------- + +atf_test_case C +C_head() +{ + atf_set "descr" "Verifies that 'C' formatting spec works" +} +C_body() +{ + check C 19 20 +} + +# ---------------------------------------------------------------------- + +atf_test_case c +c_head() +{ + atf_set "descr" "Verifies that 'c' formatting spec works" +} +c_body() +{ + check c "Sat Feb 7 07:04:03 1970" "Mon Nov 12 21:20:00 2001" +} + +# ---------------------------------------------------------------------- + +atf_test_case D +D_head() +{ + atf_set "descr" "Verifies that 'D' formatting spec works" +} +D_body() +{ + check D 02/07/70 11/12/01 +} + +# ---------------------------------------------------------------------- + +atf_test_case d +d_head() +{ + atf_set "descr" "Verifies that 'd' formatting spec works" +} +d_body() +{ + check d 07 12 +} + +# ---------------------------------------------------------------------- + +atf_test_case e +e_head() +{ + atf_set "descr" "Verifies that 'e' formatting spec works" +} +e_body() +{ + check e " 7" 12 +} + +# ---------------------------------------------------------------------- + +atf_test_case F +F_head() +{ + atf_set "descr" "Verifies that 'F' formatting spec works" +} +F_body() +{ + check F "1970-02-07" "2001-11-12" +} + +# ---------------------------------------------------------------------- + +atf_test_case G +G_head() +{ + atf_set "descr" "Verifies that 'G' formatting spec works" +} +G_body() +{ + check G 1970 2001 +} + +# ---------------------------------------------------------------------- + +atf_test_case g +g_head() +{ + atf_set "descr" "Verifies that 'g' formatting spec works" +} +g_body() +{ + check g 70 01 +} + +# ---------------------------------------------------------------------- + +atf_test_case H +H_head() +{ + atf_set "descr" "Verifies that 'H' formatting spec works" +} +H_body() +{ + check H 07 21 +} + +# ---------------------------------------------------------------------- + +atf_test_case h +h_head() +{ + atf_set "descr" "Verifies that 'h' formatting spec works" +} +h_body() +{ + check h Feb Nov +} + +# ---------------------------------------------------------------------- + +atf_test_case I +I_head() +{ + atf_set "descr" "Verifies that 'I' formatting spec works" +} +I_body() +{ + check I 07 09 +} + +# ---------------------------------------------------------------------- + +atf_test_case j +j_head() +{ + atf_set "descr" "Verifies that 'j' formatting spec works" +} +j_body() +{ + check j 038 316 +} + +# ---------------------------------------------------------------------- + +atf_test_case k +k_head() +{ + atf_set "descr" "Verifies that 'k' formatting spec works" +} +k_body() +{ + check k " 7" 21 +} + +# ---------------------------------------------------------------------- + +atf_test_case l +l_head() +{ + atf_set "descr" "Verifies that 'l' formatting spec works" +} +l_body() +{ + check l " 7" " 9" +} + +# ---------------------------------------------------------------------- + +atf_test_case M +M_head() +{ + atf_set "descr" "Verifies that 'M' formatting spec works" +} +M_body() +{ + check M 04 20 +} + +# ---------------------------------------------------------------------- + +atf_test_case m +m_head() +{ + atf_set "descr" "Verifies that 'm' formatting spec works" +} +m_body() +{ + check m 02 11 +} + +# ---------------------------------------------------------------------- + +atf_test_case p +p_head() +{ + atf_set "descr" "Verifies that 'p' formatting spec works" +} +p_body() +{ + check p AM PM +} + +# ---------------------------------------------------------------------- + +atf_test_case R +R_head() +{ + atf_set "descr" "Verifies that 'R' formatting spec works" +} +R_body() +{ + check R 07:04 21:20 +} + +# ---------------------------------------------------------------------- + +atf_test_case r +r_head() +{ + atf_set "descr" "Verifies that 'r' formatting spec works" +} +r_body() +{ + check r "07:04:03 AM" "09:20:00 PM" +} + +# ---------------------------------------------------------------------- + +atf_test_case S +S_head() +{ + atf_set "descr" "Verifies that 'S' formatting spec works" +} +S_body() +{ + check S 03 00 +} + +# ---------------------------------------------------------------------- + +atf_test_case s +s_head() +{ + atf_set "descr" "Verifies that 's' formatting spec works" +} +s_body() +{ + check s ${TEST1} ${TEST2} +} + +# ---------------------------------------------------------------------- + +atf_test_case U +U_head() +{ + atf_set "descr" "Verifies that 'U' formatting spec works" +} +U_body() +{ + check U 05 45 +} + +# ---------------------------------------------------------------------- + +atf_test_case u +u_head() +{ + atf_set "descr" "Verifies that 'u' formatting spec works" +} +u_body() +{ + check u 6 1 +} + +# ---------------------------------------------------------------------- + +atf_test_case V +V_head() +{ + atf_set "descr" "Verifies that 'V' formatting spec works" +} +V_body() +{ + check V 06 46 +} + +# ---------------------------------------------------------------------- + +atf_test_case v +v_head() +{ + atf_set "descr" "Verifies that 'v' formatting spec works" +} +v_body() +{ + check v " 7-Feb-1970" "12-Nov-2001" +} + +# ---------------------------------------------------------------------- + +atf_test_case W +W_head() +{ + atf_set "descr" "Verifies that 'W' formatting spec works" +} +W_body() +{ + check W 05 46 +} + +# ---------------------------------------------------------------------- + +atf_test_case w +w_head() +{ + atf_set "descr" "Verifies that 'w' formatting spec works" +} +w_body() +{ + check w 6 1 +} + +# ---------------------------------------------------------------------- + +atf_test_case X +X_head() +{ + atf_set "descr" "Verifies that 'X' formatting spec works" +} +X_body() +{ + check X "07:04:03" "21:20:00" +} + +# ---------------------------------------------------------------------- + +atf_test_case x +x_head() +{ + atf_set "descr" "Verifies that 'x' formatting spec works" +} +x_body() +{ + check x "02/07/70" "11/12/01" +} + +# ---------------------------------------------------------------------- + +atf_test_case Y +Y_head() +{ + atf_set "descr" "Verifies that 'Y' formatting spec works" +} +Y_body() +{ + check Y 1970 2001 +} + +# ---------------------------------------------------------------------- + +atf_test_case y +y_head() +{ + atf_set "descr" "Verifies that 'y' formatting spec works" +} +y_body() +{ + check y 70 01 +} + +# ---------------------------------------------------------------------- + +atf_test_case Z +Z_head() +{ + atf_set "descr" "Verifies that 'Z' formatting spec works" +} +Z_body() +{ + check Z UTC UTC +} + +# ---------------------------------------------------------------------- + +atf_test_case z +z_head() +{ + atf_set "descr" "Verifies that 'z' formatting spec works" +} +z_body() +{ + check z +0000 +0000 +} + +# ---------------------------------------------------------------------- + +atf_test_case pct +pct_head() +{ + atf_set "descr" "Verifies that '%' formatting spec works" +} +pct_body() +{ + check % % % +} + +# ---------------------------------------------------------------------- + +atf_test_case plus +plus_head() +{ + atf_set "descr" "Verifies that '+' formatting spec works" +} +plus_body() +{ + check + "Sat Feb 7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001" +} + +# ---------------------------------------------------------------------- +# Main test case driving script. +# ---------------------------------------------------------------------- + +atf_init_test_cases() +{ + atf_add_test_case A + atf_add_test_case a + atf_add_test_case B + atf_add_test_case b + atf_add_test_case C + atf_add_test_case c + atf_add_test_case D + atf_add_test_case d + atf_add_test_case e + atf_add_test_case F + atf_add_test_case G + atf_add_test_case g + atf_add_test_case H + atf_add_test_case h + atf_add_test_case I + atf_add_test_case j + atf_add_test_case k + atf_add_test_case l + atf_add_test_case M + atf_add_test_case m + atf_add_test_case p + atf_add_test_case R + atf_add_test_case r + atf_add_test_case S + atf_add_test_case s + atf_add_test_case U + atf_add_test_case u + atf_add_test_case V + atf_add_test_case v + atf_add_test_case W + atf_add_test_case w + atf_add_test_case X + atf_add_test_case x + atf_add_test_case Y + atf_add_test_case y + atf_add_test_case Z + atf_add_test_case z + atf_add_test_case pct + atf_add_test_case plus +} + +# vim:syntax=sh diff --git a/bin/date/tests/legacy_test.sh b/bin/date/tests/legacy_test.sh deleted file mode 100644 index 981bdd0..0000000 --- a/bin/date/tests/legacy_test.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# -# Regression tests for date(1) -# -# Submitted by Edwin Groothuis -# -# $FreeBSD$ -# - -# -# These two date/times have been chosen carefully, they -# create both the single digit and double/multidigit version of -# the values. -# -# To create a new one, make sure you are using the UTC timezone! -# - -TEST1=3222243 # 1970-02-07 07:04:03 -TEST2=1005600000 # 2001-11-12 21:11:12 - -export LC_ALL=C -export TZ=UTC -count=0 - -check() -{ - S=$1 - A1=$2 - A2=$3 - - count=`expr ${count} + 1` - - if [ -z "${A2}" ]; then A2=${A1}; fi - - R=`date -r ${TEST1} +%${S}` - if [ "${R}" = "${A1}" ]; then - echo "ok ${S}{t1}" - else - echo "no ok ${S}{t1} - (got ${R}, expected ${A1})" - fi - - R=`date -r ${TEST2} +%${S}` - if [ "${R}" = "${A2}" ]; then - echo "ok ${S}{t2}" - else - echo "no ok ${S}{t2} - (got ${R}, expected ${A2})" - fi -} - -echo "1..78" - -check A Saturday Monday -check a Sat Mon -check B February November -check b Feb Nov -check C 19 20 -check c "Sat Feb 7 07:04:03 1970" "Mon Nov 12 21:20:00 2001" -check D 02/07/70 11/12/01 -check d 07 12 -check e " 7" 12 -check F "1970-02-07" "2001-11-12" -check G 1970 2001 -check g 70 01 -check H 07 21 -check h Feb Nov -check I 07 09 -check j 038 316 -check k " 7" 21 -check l " 7" " 9" -check M 04 20 -check m 02 11 -check p AM PM -check R 07:04 21:20 -check r "07:04:03 AM" "09:20:00 PM" -check S 03 00 -check s ${TEST1} ${TEST2} -check U 05 45 -check u 6 1 -check V 06 46 -check v " 7-Feb-1970" "12-Nov-2001" -check W 05 46 -check w 6 1 -check X "07:04:03" "21:20:00" -check x "02/07/70" "11/12/01" -check Y 1970 2001 -check y 70 01 -check Z UTC UTC -check z +0000 +0000 -check % % % -check + "Sat Feb 7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001" --Apple-Mail=_F518CF31-AFAD-4414-BB2B-AB1861E87B42-- 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--