svn commit: r327806 - in head: etc/mtree usr.bin/awk usr.bin/awk/tests

[Warner Losh]

On Wed, Jan 10, 2018 at 10:36 PM, Kyle Evans <kevans at freebsd.org> wrote:

> Author: kevans
> Date: Thu Jan 11 05:36:13 2018
> New Revision: 327806
> URL: https://svnweb.freebsd.org/changeset/base/327806
>
> Log:
>   awk(1): Add necessary bits for connecting tests, but leave disconnected
>
>   The NetBSD test suite has 24 tests for awk, and we pass exactly 4 of
> them.
>   Add the necessary pieces for interested parties to easily connect the
>   tests and run them, but leave them disconnected for the time being.
>
>   Some of these tests outright segfault in our awk, others just exhibit the
>   wrong behavior.
>

How many tests does NetBSD's awk pass? At least one of their patches causes
our .m compiler awk script to fail, if I've applied it correctly.

Warner


> Added:
>   head/usr.bin/awk/tests/
>   head/usr.bin/awk/tests/Makefile   (contents, props changed)
> Modified:
>   head/etc/mtree/BSD.tests.dist
>   head/usr.bin/awk/Makefile
>
> Modified: head/etc/mtree/BSD.tests.dist
> ============================================================
> ==================
> --- head/etc/mtree/BSD.tests.dist       Thu Jan 11 03:11:41 2018
> (r327805)
> +++ head/etc/mtree/BSD.tests.dist       Thu Jan 11 05:36:13 2018
> (r327806)
> @@ -536,6 +536,8 @@
>      usr.bin
>          apply
>          ..
> +        awk
> +        ..
>          basename
>          ..
>          bmake
>
> Modified: head/usr.bin/awk/Makefile
> ============================================================
> ==================
> --- head/usr.bin/awk/Makefile   Thu Jan 11 03:11:41 2018        (r327805)
> +++ head/usr.bin/awk/Makefile   Thu Jan 11 05:36:13 2018        (r327806)
> @@ -1,5 +1,7 @@
>  # $FreeBSD$
>
> +.include <src.opts.mk>
> +
>  AWKSRC=        ${SRCTOP}/contrib/one-true-awk
>  .PATH: ${AWKSRC}
>
> @@ -27,5 +29,9 @@ proctab.c: maketab
>
>  build-tools: maketab
>  maketab: ytab.h maketab.c ${BUILD_TOOLS_META}
> +
> +# awk needs some work before we can connect these tests to the build
> +#HAS_TESTS=
> +SUBDIR.${MK_TESTS}+= tests
>
>  .include <bsd.prog.mk>
>
> Added: head/usr.bin/awk/tests/Makefile
> ============================================================
> ==================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/usr.bin/awk/tests/Makefile     Thu Jan 11 05:36:13 2018
> (r327806)
> @@ -0,0 +1,33 @@
> +# $FreeBSD$
> +
> +PACKAGE=       tests
> +
> +NETBSD_ATF_TESTS_SH=   awk_test
> +
> +${PACKAGE}FILES+=      d_assign_NF.awk
> +${PACKAGE}FILES+=      d_assign_NF.in
> +${PACKAGE}FILES+=      d_assign_NF.out
> +${PACKAGE}FILES+=      d_big_regexp.awk
> +${PACKAGE}FILES+=      d_big_regexp.in
> +${PACKAGE}FILES+=      d_big_regexp.out
> +${PACKAGE}FILES+=      d_end1.awk
> +${PACKAGE}FILES+=      d_end1.in
> +${PACKAGE}FILES+=      d_end1.out
> +${PACKAGE}FILES+=      d_end2.awk
> +${PACKAGE}FILES+=      d_end2.in
> +${PACKAGE}FILES+=      d_end2.out
> +${PACKAGE}FILES+=      d_period.awk
> +${PACKAGE}FILES+=      d_period.in
> +${PACKAGE}FILES+=      d_period.out
> +${PACKAGE}FILES+=      d_string1.awk
> +${PACKAGE}FILES+=      d_string1.out
> +${PACKAGE}FILES+=      d_tolower.awk
> +${PACKAGE}FILES+=      d_tolower.in
> +${PACKAGE}FILES+=      d_tolower.out
> +${PACKAGE}FILES+=      d_toupper.awk
> +${PACKAGE}FILES+=      d_toupper.in
> +${PACKAGE}FILES+=      d_toupper.out
> +
> +.include <netbsd-tests.test.mk>
> +
> +.include <bsd.test.mk>
>
>