Author: rodrigc
Date: Sat Oct 11 19:18:00 2014
New Revision: 272953
URL: https://svnweb.freebsd.org/changeset/base/272953
Log:
Merge: r268811
Update to byacc 20140715
PR: 191020
Submitted by: gcooper (yaneurab...@gmail.com)
Added:
stable/10/usr.bin/yacc/tests/yacc_tests.sh
- copied unchanged from r268811, head/usr.bin/yacc/tests/yacc_tests.sh
Deleted:
stable/10/contrib/byacc/NOTES-btyacc-Changes
stable/10/contrib/byacc/NOTES-btyacc-Disposition
stable/10/usr.bin/yacc/tests/calc.y
stable/10/usr.bin/yacc/tests/calc1.y
stable/10/usr.bin/yacc/tests/calc2.y
stable/10/usr.bin/yacc/tests/calc3.y
stable/10/usr.bin/yacc/tests/code_calc.y
stable/10/usr.bin/yacc/tests/code_error.y
stable/10/usr.bin/yacc/tests/error.y
stable/10/usr.bin/yacc/tests/ftp.y
stable/10/usr.bin/yacc/tests/grammar.y
stable/10/usr.bin/yacc/tests/legacy_test.sh
stable/10/usr.bin/yacc/tests/pure_calc.y
stable/10/usr.bin/yacc/tests/pure_error.y
stable/10/usr.bin/yacc/tests/quote_calc.y
stable/10/usr.bin/yacc/tests/quote_calc2.y
stable/10/usr.bin/yacc/tests/quote_calc3.y
stable/10/usr.bin/yacc/tests/quote_calc4.y
stable/10/usr.bin/yacc/tests/regress.00.out
stable/10/usr.bin/yacc/tests/regress.01.out
stable/10/usr.bin/yacc/tests/regress.02.out
stable/10/usr.bin/yacc/tests/regress.03.out
stable/10/usr.bin/yacc/tests/regress.04.out
stable/10/usr.bin/yacc/tests/regress.05.out
stable/10/usr.bin/yacc/tests/regress.06.out
stable/10/usr.bin/yacc/tests/regress.07.out
stable/10/usr.bin/yacc/tests/regress.08.out
stable/10/usr.bin/yacc/tests/regress.09.out
stable/10/usr.bin/yacc/tests/regress.10.out
stable/10/usr.bin/yacc/tests/regress.11.out
stable/10/usr.bin/yacc/tests/regress.12.out
stable/10/usr.bin/yacc/tests/regress.13.out
stable/10/usr.bin/yacc/tests/regress.14.out
stable/10/usr.bin/yacc/tests/regress.sh
stable/10/usr.bin/yacc/tests/undefined.y
Modified:
stable/10/contrib/byacc/CHANGES
stable/10/contrib/byacc/MANIFEST
stable/10/contrib/byacc/VERSION
stable/10/contrib/byacc/aclocal.m4
stable/10/contrib/byacc/main.c
stable/10/contrib/byacc/package/byacc.spec
stable/10/contrib/byacc/package/debian/changelog
stable/10/contrib/byacc/package/mingw-byacc.spec
stable/10/contrib/byacc/package/pkgsrc/Makefile
stable/10/contrib/byacc/test/btyacc/big_b.output
stable/10/contrib/byacc/test/btyacc/big_l.output
stable/10/contrib/byacc/test/btyacc/err_inherit1.error
stable/10/contrib/byacc/test/btyacc/err_inherit2.error
stable/10/contrib/byacc/test/btyacc/err_inherit3.error
stable/10/contrib/byacc/test/btyacc/err_inherit4.error
stable/10/contrib/byacc/test/btyacc/err_inherit5.error
stable/10/contrib/byacc/test/btyacc/err_syntax1.error
stable/10/contrib/byacc/test/btyacc/err_syntax10.error
stable/10/contrib/byacc/test/btyacc/err_syntax11.error
stable/10/contrib/byacc/test/btyacc/err_syntax12.error
stable/10/contrib/byacc/test/btyacc/err_syntax13.error
stable/10/contrib/byacc/test/btyacc/err_syntax14.error
stable/10/contrib/byacc/test/btyacc/err_syntax15.error
stable/10/contrib/byacc/test/btyacc/err_syntax16.error
stable/10/contrib/byacc/test/btyacc/err_syntax17.error
stable/10/contrib/byacc/test/btyacc/err_syntax18.error
stable/10/contrib/byacc/test/btyacc/err_syntax19.error
stable/10/contrib/byacc/test/btyacc/err_syntax2.error
stable/10/contrib/byacc/test/btyacc/err_syntax21.error
stable/10/contrib/byacc/test/btyacc/err_syntax22.error
stable/10/contrib/byacc/test/btyacc/err_syntax23.error
stable/10/contrib/byacc/test/btyacc/err_syntax24.error
stable/10/contrib/byacc/test/btyacc/err_syntax25.error
stable/10/contrib/byacc/test/btyacc/err_syntax26.error
stable/10/contrib/byacc/test/btyacc/err_syntax27.error
stable/10/contrib/byacc/test/btyacc/err_syntax3.error
stable/10/contrib/byacc/test/btyacc/err_syntax4.error
stable/10/contrib/byacc/test/btyacc/err_syntax5.error
stable/10/contrib/byacc/test/btyacc/err_syntax6.error
stable/10/contrib/byacc/test/btyacc/err_syntax7.error
stable/10/contrib/byacc/test/btyacc/err_syntax7a.error
stable/10/contrib/byacc/test/btyacc/err_syntax7b.error
stable/10/contrib/byacc/test/btyacc/err_syntax8.error
stable/10/contrib/byacc/test/btyacc/err_syntax8a.error
stable/10/contrib/byacc/test/btyacc/err_syntax9.error
stable/10/contrib/byacc/test/btyacc/help.output
stable/10/contrib/byacc/test/btyacc/no_b_opt.output
stable/10/contrib/byacc/test/btyacc/no_output2.output
stable/10/contrib/byacc/test/btyacc/no_p_opt.output
stable/10/contrib/byacc/test/btyacc/nostdin.output
stable/10/contrib/byacc/test/run_test.sh
stable/10/contrib/byacc/test/yacc/big_b.output
stable/10/contrib/byacc/test/yacc/big_l.output
stable/10/contrib/byacc/test/yacc/err_syntax1.error
stable/10/contrib/byacc/test/yacc/err_syntax10.error
stable/10/contrib/byacc/test/yacc/err_syntax11.error
stable/10/contrib/byacc/test/yacc/err_syntax12.error
stable/10/contrib/byacc/test/yacc/err_syntax13.error
stable/10/contrib/byacc/test/yacc/err_syntax14.error
stable/10/contrib/byacc/test/yacc/err_syntax15.error
stable/10/contrib/byacc/test/yacc/err_syntax16.error
stable/10/contrib/byacc/test/yacc/err_syntax17.error
stable/10/contrib/byacc/test/yacc/err_syntax18.error
stable/10/contrib/byacc/test/yacc/err_syntax19.error
stable/10/contrib/byacc/test/yacc/err_syntax2.error
stable/10/contrib/byacc/test/yacc/err_syntax21.error
stable/10/contrib/byacc/test/yacc/err_syntax22.error
stable/10/contrib/byacc/test/yacc/err_syntax23.error
stable/10/contrib/byacc/test/yacc/err_syntax24.error
stable/10/contrib/byacc/test/yacc/err_syntax25.error
stable/10/contrib/byacc/test/yacc/err_syntax26.error
stable/10/contrib/byacc/test/yacc/err_syntax27.error
stable/10/contrib/byacc/test/yacc/err_syntax3.error
stable/10/contrib/byacc/test/yacc/err_syntax4.error
stable/10/contrib/byacc/test/yacc/err_syntax5.error
stable/10/contrib/byacc/test/yacc/err_syntax6.error
stable/10/contrib/byacc/test/yacc/err_syntax7.error
stable/10/contrib/byacc/test/yacc/err_syntax7a.error
stable/10/contrib/byacc/test/yacc/err_syntax7b.error
stable/10/contrib/byacc/test/yacc/err_syntax8.error
stable/10/contrib/byacc/test/yacc/err_syntax8a.error
stable/10/contrib/byacc/test/yacc/err_syntax9.error
stable/10/contrib/byacc/test/yacc/help.output
stable/10/contrib/byacc/test/yacc/no_b_opt.output
stable/10/contrib/byacc/test/yacc/no_output2.output
stable/10/contrib/byacc/test/yacc/no_p_opt.output
stable/10/contrib/byacc/test/yacc/nostdin.output
stable/10/usr.bin/yacc/tests/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/byacc/CHANGES
==============================================================================
--- stable/10/contrib/byacc/CHANGES Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/CHANGES Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,3 +1,38 @@
+2014-07-15 Thomas E. Dickey <t...@invisible-island.net>
+
+ * aclocal.m4: resync with my-autoconf (no change to configure script)
+
+ * VERSION, package/byacc.spec, package/debian/changelog,
package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * test/run_test.sh:
+ make top-level "make check" work again, by adding another step to
filtering
+ the test results.
+
+2014-07-14 Thomas E. Dickey <t...@invisible-island.net>
+
+ * test/run_test.sh: changes from Garrett Cooper's patch:
+ a) ensure that the script returns an error-code if there are
differences
+ b) escape "." character in left side of sed expression for $YACC
+ c) ensure that $ifBTYACC has a value
+
+ * test/btyacc/big_b.output, test/btyacc/big_l.output,
test/btyacc/help.output, test/btyacc/no_b_opt.output,
test/btyacc/no_output2.output, test/btyacc/no_p_opt.output,
test/btyacc/nostdin.output:
+ regen (reminder by Garrett Cooper)
+
+2014-07-14 Garrett.Cooper
+
+ * test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error,
test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error,
test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error,
test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error,
test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error,
test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error,
test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error,
test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error,
test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error,
test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error,
test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error,
test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error,
test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error,
test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error,
test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error,
test/btyacc/err_syntax7b.error, test/btya
cc/err_syntax8.error, test/btyacc/err_syntax8a.error,
test/btyacc/err_syntax9.error, test/yacc/err_syntax1.error,
test/yacc/err_syntax10.error, test/yacc/err_syntax11.error,
test/yacc/err_syntax12.error, test/yacc/err_syntax13.error,
test/yacc/err_syntax14.error, test/yacc/err_syntax15.error,
test/yacc/err_syntax16.error, test/yacc/err_syntax17.error,
test/yacc/err_syntax18.error, test/yacc/err_syntax19.error,
test/yacc/err_syntax2.error, test/yacc/err_syntax21.error,
test/yacc/err_syntax22.error, test/yacc/err_syntax23.error,
test/yacc/err_syntax24.error, test/yacc/err_syntax25.error,
test/yacc/err_syntax26.error, test/yacc/err_syntax27.error,
test/yacc/err_syntax3.error, test/yacc/err_syntax4.error,
test/yacc/err_syntax5.error, test/yacc/err_syntax6.error,
test/yacc/err_syntax7.error, test/yacc/err_syntax7a.error,
test/yacc/err_syntax7b.error, test/yacc/err_syntax8.error,
test/yacc/err_syntax8a.error, test/yacc/err_syntax9.error:
+ regen
+
+2014-05-27 Tom.Shields
+
+ * main.c: remove obsolete -D option from usage message
+
+2014-05-27 Thomas E. Dickey <t...@invisible-island.net>
+
+ * VERSION, package/byacc.spec, package/debian/changelog,
test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output,
test/yacc/no_b_opt.output, test/yacc/no_output2.output,
test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+ bump
+
2014-04-22 Thomas E. Dickey <t...@invisible-island.net>
* mstring.c:
Modified: stable/10/contrib/byacc/MANIFEST
==============================================================================
--- stable/10/contrib/byacc/MANIFEST Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/MANIFEST Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140422, version t20140422
+MANIFEST for byacc-20140715, version t20140715
--------------------------------------------------------------------------------
MANIFEST this file
ACKNOWLEDGEMENTS original version of byacc - 1993
Modified: stable/10/contrib/byacc/VERSION
==============================================================================
--- stable/10/contrib/byacc/VERSION Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/VERSION Sat Oct 11 19:18:00 2014
(r272953)
@@ -1 +1 @@
-20140422
+20140715
Modified: stable/10/contrib/byacc/aclocal.m4
==============================================================================
--- stable/10/contrib/byacc/aclocal.m4 Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/aclocal.m4 Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.34 2014/04/06 19:16:18 tom Exp $
+dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -28,7 +28,7 @@ dnl sale, use or other dealings in this
dnl authorization.
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
dnl ------------------
dnl Conditionally generate script according to whether we're using a given
autoconf.
dnl
@@ -37,7 +37,7 @@ dnl $2 = code to use if AC_ACVERSION is
dnl $3 = code to use if AC_ACVERSION is older than $1.
define([CF_ACVERSION_CHECK],
[
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION],
,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
ifdef([m4_version_compare],
[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
[CF_ACVERSION_COMPARE(
@@ -930,7 +930,7 @@ AC_PROG_AWK
test -z "$AWK" && AC_MSG_ERROR(No awk program found)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
dnl ----------
dnl standard check for CC, plus followup sanity checks
dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -940,7 +940,7 @@ CF_GCC_VERSION
CF_ACVERSION_CHECK(2.52,
[AC_PROG_CC_STDC],
[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS
+CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
Modified: stable/10/contrib/byacc/main.c
==============================================================================
--- stable/10/contrib/byacc/main.c Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/main.c Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.50 2014/04/22 23:34:47 tom Exp $ */
+/* $Id: main.c,v 1.51 2014/05/28 02:01:55 Tom.Shields Exp $ */
#include <signal.h>
#ifndef _WIN32
@@ -208,7 +208,6 @@ usage(void)
," -b file_prefix set filename prefix (default \"y.\")"
," -B create a backtracking parser"
," -d write definitions (" DEFINES_SUFFIX ")"
- ," -D enable value stack memory reclamation"
," -i write interface (y.tab.i)"
," -g write a graphical description"
," -l suppress #line directives"
Modified: stable/10/contrib/byacc/package/byacc.spec
==============================================================================
--- stable/10/contrib/byacc/package/byacc.spec Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/package/byacc.spec Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,8 +1,8 @@
Summary: byacc - public domain Berkeley LALR Yacc parser generator
%define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
%define UseProgram yacc
-# $XTermId: byacc.spec,v 1.20 2014/04/22 08:13:20 tom Exp $
+# $XTermId: byacc.spec,v 1.22 2014/07/15 19:36:54 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
Modified: stable/10/contrib/byacc/package/debian/changelog
==============================================================================
--- stable/10/contrib/byacc/package/debian/changelog Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/package/debian/changelog Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,15 @@
+byacc (20140715) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Tue, 15 Jul 2014 15:36:54
-0400
+
+byacc (20140527) unstable; urgency=low
+
+ * remove obsolete option from usage message
+
+ -- Thomas E. Dickey <dic...@invisible-island.net> Tue, 27 May 2014 22:01:55
-0400
+
byacc (20140422) unstable; urgency=low
* maintenance updates
Modified: stable/10/contrib/byacc/package/mingw-byacc.spec
==============================================================================
--- stable/10/contrib/byacc/package/mingw-byacc.spec Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/package/mingw-byacc.spec Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,8 +1,8 @@
Summary: byacc - public domain Berkeley LALR Yacc parser generator
%define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
%define UseProgram yacc
-# $XTermId: mingw-byacc.spec,v 1.3 2014/04/22 08:13:20 tom Exp $
+# $XTermId: mingw-byacc.spec,v 1.4 2014/07/15 19:36:54 tom Exp $
Name: %{AppProgram}
Version: %{AppVersion}
Release: 1
Modified: stable/10/contrib/byacc/package/pkgsrc/Makefile
==============================================================================
--- stable/10/contrib/byacc/package/pkgsrc/Makefile Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/package/pkgsrc/Makefile Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
#
-DISTNAME= byacc-20140422
+DISTNAME= byacc-20140715
PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/byacc/
Modified: stable/10/contrib/byacc/test/btyacc/big_b.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/big_b.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/big_b.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/big_l.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/big_l.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/big_l.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/err_inherit1.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_inherit1.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_inherit1.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 64 of "./test/err_inherit1.y", unterminated argument list
+YACC: e - line 64 of "./err_inherit1.y", unterminated argument list
namelist($c, $t
^
Modified: stable/10/contrib/byacc/test/btyacc/err_inherit2.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_inherit2.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_inherit2.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,5 +1,5 @@
-YACC: w - line 64 of "./test/err_inherit2.y", number of arguments of namelist
doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit2.y", type of argument 1 to namelist
doesn't agree with previous declaration
-YACC: e - line 64 of "./test/err_inherit2.y", bad formal argument list
+YACC: w - line 64 of "./err_inherit2.y", number of arguments of namelist
doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit2.y", type of argument 1 to namelist
doesn't agree with previous declaration
+YACC: e - line 64 of "./err_inherit2.y", bad formal argument list
namelist($<tval>c, $t, extra): namelist NAME
^
Modified: stable/10/contrib/byacc/test/btyacc/err_inherit3.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_inherit3.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_inherit3.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,23 +1,23 @@
-YACC: w - line 64 of "./test/err_inherit3.y", number of arguments of namelist
doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit3.y", wrong number of arguments for
namelist
+YACC: w - line 64 of "./err_inherit3.y", number of arguments of namelist
doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit3.y", wrong number of arguments for namelist
namelist: namelist($c) NAME
^
-YACC: w - line 64 of "./test/err_inherit3.y", unknown argument $c
-YACC: w - line 64 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 64 of "./err_inherit3.y", unknown argument $c
+YACC: w - line 64 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $t
{ $$->s = mksymbol($<tval>t, $<cval>c, $2);
^
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $c
{ $$->s = mksymbol($<tval>t, $<cval>c, $2);
^
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $t
{ $$->s = mksymbol($t, $c, $1);
^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $t
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $c
{ $$->s = mksymbol($t, $c, $1);
^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 0 of "./test/err_inherit3.y", start symbol declaration requires
arguments
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 0 of "./err_inherit3.y", start symbol declaration requires
arguments
YACC: 1 rule never reduced
YACC: 3 shift/reduce conflicts.
Modified: stable/10/contrib/byacc/test/btyacc/err_inherit4.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_inherit4.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_inherit4.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,13 +1,13 @@
-YACC: w - line 32 of "./test/err_inherit4.y", destructor redeclared
+YACC: w - line 32 of "./err_inherit4.y", destructor redeclared
%destructor {
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong number of default
arguments for namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong number of default arguments for
namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument
2 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 2 to
namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument
1 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 1 to
namelist
{ $$ = $1; @$ = @2; }
^
-YACC: w - line 77 of "./test/err_inherit4.y", @2 references beyond the end of
the current rule
+YACC: w - line 77 of "./err_inherit4.y", @2 references beyond the end of the
current rule
Modified: stable/10/contrib/byacc/test/btyacc/err_inherit5.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_inherit5.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_inherit5.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 74 of "./test/err_inherit5.y", illegal @$ or @N reference
+YACC: e - line 74 of "./err_inherit5.y", illegal @$ or @N reference
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax1.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax1.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax1.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
?% {
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax10.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax10.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax10.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been
redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been
redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been
redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax11.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax11.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax11.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been
redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been
redeclared
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax12.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax12.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax12.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been
redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax13.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax13.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax13.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax14.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax14.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax14.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been
redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
YACC: e - the start symbol text2 is undefined
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax15.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax15.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax15.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax16.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax16.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax16.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a
production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a
production
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax17.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax17.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax17.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
S: { error
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax18.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax18.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax18.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of
the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the
current rule
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax19.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax19.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax19.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
{ $$ = $<oops>; }
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax2.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax2.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax2.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
%{ /*
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax21.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax21.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax21.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax22.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax22.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax22.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax23.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax23.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax23.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax24.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax24.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax24.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an
undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an
undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax25.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax25.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax25.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
%union {
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax26.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax26.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax26.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax27.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax27.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax27.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax3.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax3.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax3.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
%token <text> '(' '*' '&
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax4.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax4.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax4.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
%{
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax5.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax5.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax5.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
%union {
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax6.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax6.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax6.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
%token <text) '(' '*' '&
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax7.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax7.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax7.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
%token <text> '\777'
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax7a.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax7a.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax7a.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
%token <text> '\xfff'
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax7b.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax7b.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax7b.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
%token <text> '\x.'
^
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax8.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax8.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax8.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax8a.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax8a.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax8a.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol
$$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
Modified: stable/10/contrib/byacc/test/btyacc/err_syntax9.error
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/err_syntax9.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/err_syntax9.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be
declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be
declared to be a token
Modified: stable/10/contrib/byacc/test/btyacc/help.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/help.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/help.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/no_b_opt.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/no_b_opt.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/no_b_opt.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/no_output2.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/no_output2.output Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/no_output2.output Sat Oct 11
19:18:00 2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/no_p_opt.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/no_p_opt.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/no_p_opt.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/btyacc/nostdin.output
==============================================================================
--- stable/10/contrib/byacc/test/btyacc/nostdin.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/btyacc/nostdin.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/run_test.sh
==============================================================================
--- stable/10/contrib/byacc/test/run_test.sh Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/contrib/byacc/test/run_test.sh Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,7 +1,9 @@
#!/bin/sh
-# $Id: run_test.sh,v 1.22 2014/04/09 11:00:45 tom Exp $
+# $Id: run_test.sh,v 1.24 2014/07/15 19:21:10 tom Exp $
# vi:ts=4 sw=4:
+errors=0
+
# NEW is the file created by the testcase
# REF is the reference file against which to compare
test_diffs() {
@@ -11,13 +13,15 @@ test_diffs() {
if test ! -f $CMP
then
echo "...not found $CMP"
+ errors=1
else
sed -e s,$NEW,$REF, \
- -e "s%$YACC%YACC%" \
+ -e "s%$YACC_escaped%YACC%" \
-e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \
-e '/#define YYPATCH/s/PATCH/CHECK/' \
-e 's,#line \([1-9][0-9]*\) "'$REF_DIR'/,#line \1 ",' \
-e 's,#line \([1-9][0-9]*\) "'$TEST_DIR'/,#line \1 ",' \
+ -e 's,\(YACC:.* line [0-9][0-9]* of
"\)'$TEST_DIR/',\1./,' \
< $CMP >$tmpfile \
&& mv $tmpfile $CMP
if test ! -f $REF
@@ -31,6 +35,7 @@ test_diffs() {
else
echo "...diff $REF"
diff -u $REF $CMP
+ errors=1
fi
fi
}
@@ -62,10 +67,11 @@ else
fi
YACC=$PROG_DIR/yacc
+YACC_escaped=`echo "$PROG_DIR/yacc" | sed -e 's/\./\\\./g'`
tmpfile=temp$$
-ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo
$?`
+ifBTYACC=`fgrep -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $?
!= 0; echo $?`
if test $ifBTYACC = 0; then
REF_DIR=${TEST_DIR}/yacc
@@ -236,3 +242,5 @@ do
;;
esac
done
+
+exit $errors
Modified: stable/10/contrib/byacc/test/yacc/big_b.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/big_b.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/big_b.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -5,7 +5,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/big_l.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/big_l.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/big_l.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -5,7 +5,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/err_syntax1.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax1.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax1.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
?% {
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax10.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax10.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax10.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been
redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been
redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been
redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
Modified: stable/10/contrib/byacc/test/yacc/err_syntax11.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax11.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax11.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been
redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been
redeclared
Modified: stable/10/contrib/byacc/test/yacc/err_syntax12.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax12.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax12.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been
redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
Modified: stable/10/contrib/byacc/test/yacc/err_syntax13.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax13.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax13.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
Modified: stable/10/contrib/byacc/test/yacc/err_syntax14.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax14.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax14.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been
redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
YACC: e - the start symbol text2 is undefined
Modified: stable/10/contrib/byacc/test/yacc/err_syntax15.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax15.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax15.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
Modified: stable/10/contrib/byacc/test/yacc/err_syntax16.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax16.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax16.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a
production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a
production
Modified: stable/10/contrib/byacc/test/yacc/err_syntax17.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax17.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax17.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
S: { error
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax18.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax18.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax18.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of
the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the
current rule
Modified: stable/10/contrib/byacc/test/yacc/err_syntax19.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax19.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax19.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
{ $$ = $<oops>; }
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax2.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax2.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax2.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
%{ /*
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax21.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax21.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax21.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
Modified: stable/10/contrib/byacc/test/yacc/err_syntax22.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax22.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax22.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
Modified: stable/10/contrib/byacc/test/yacc/err_syntax23.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax23.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax23.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
Modified: stable/10/contrib/byacc/test/yacc/err_syntax24.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax24.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax24.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an
undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an
undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
Modified: stable/10/contrib/byacc/test/yacc/err_syntax25.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax25.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax25.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
%union {
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax26.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax26.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax26.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
Modified: stable/10/contrib/byacc/test/yacc/err_syntax27.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax27.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax27.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
Modified: stable/10/contrib/byacc/test/yacc/err_syntax3.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax3.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax3.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
%token <text> '(' '*' '&
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax4.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax4.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax4.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
%{
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax5.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax5.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax5.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
%union {
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax6.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax6.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax6.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
%token <text) '(' '*' '&
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax7.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax7.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax7.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
%token <text> '\777'
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax7a.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax7a.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax7a.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
%token <text> '\xfff'
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax7b.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax7b.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax7b.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
%token <text> '\x.'
^
Modified: stable/10/contrib/byacc/test/yacc/err_syntax8.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax8.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax8.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
Modified: stable/10/contrib/byacc/test/yacc/err_syntax8a.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax8a.error Sat Oct 11
19:09:56 2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax8a.error Sat Oct 11
19:18:00 2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol
$$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
Modified: stable/10/contrib/byacc/test/yacc/err_syntax9.error
==============================================================================
--- stable/10/contrib/byacc/test/yacc/err_syntax9.error Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/err_syntax9.error Sat Oct 11 19:18:00
2014 (r272953)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be
declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be
declared to be a token
Modified: stable/10/contrib/byacc/test/yacc/help.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/help.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/help.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/no_b_opt.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/no_b_opt.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/no_b_opt.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/no_output2.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/no_output2.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/no_output2.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/no_p_opt.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/no_p_opt.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/no_p_opt.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/contrib/byacc/test/yacc/nostdin.output
==============================================================================
--- stable/10/contrib/byacc/test/yacc/nostdin.output Sat Oct 11 19:09:56
2014 (r272952)
+++ stable/10/contrib/byacc/test/yacc/nostdin.output Sat Oct 11 19:18:00
2014 (r272953)
@@ -4,7 +4,6 @@ Options:
-b file_prefix set filename prefix (default "y.")
-B create a backtracking parser
-d write definitions (.tab.h)
- -D enable value stack memory reclamation
-i write interface (y.tab.i)
-g write a graphical description
-l suppress #line directives
Modified: stable/10/usr.bin/yacc/tests/Makefile
==============================================================================
--- stable/10/usr.bin/yacc/tests/Makefile Sat Oct 11 19:09:56 2014
(r272952)
+++ stable/10/usr.bin/yacc/tests/Makefile Sat Oct 11 19:18:00 2014
(r272953)
@@ -1,41 +1,334 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
+TEST_DIR= ${.CURDIR}/../../../contrib/byacc/test
+
+.PATH: ${TEST_DIR} ${TEST_DIR}/yacc
+
TESTSDIR= ${TESTSBASE}/usr.bin/yacc
-TAP_TESTS_SH= legacy_test
+PLAIN_TESTS_SH= yacc_tests
+
+SCRIPTS= run_test
+SCRIPTSDIR= ${TESTSDIR}
+
+FILESGROUPS= FILEStest FILEStest_yacc
+
+FILEStestDIR= ${TESTSDIR}
+
+FILEStest+= btyacc_calc1.y
+FILEStest+= btyacc_demo.y
+FILEStest+= calc.y
+FILEStest+= calc1.y
+FILEStest+= calc2.y
+FILEStest+= calc3.y
+FILEStest+= code_calc.y
+FILEStest+= code_debug.y
+FILEStest+= code_error.y
+FILEStest+= empty.y
+FILEStest+= err_inherit1.y
+FILEStest+= err_inherit2.y
+FILEStest+= err_inherit3.y
+FILEStest+= err_inherit4.y
+FILEStest+= err_inherit5.y
+FILEStest+= err_syntax1.y
+FILEStest+= err_syntax10.y
+FILEStest+= err_syntax11.y
+FILEStest+= err_syntax12.y
+FILEStest+= err_syntax13.y
+FILEStest+= err_syntax14.y
+FILEStest+= err_syntax15.y
+FILEStest+= err_syntax16.y
+FILEStest+= err_syntax17.y
+FILEStest+= err_syntax18.y
+FILEStest+= err_syntax19.y
+FILEStest+= err_syntax2.y
+FILEStest+= err_syntax20.y
+FILEStest+= err_syntax21.y
+FILEStest+= err_syntax22.y
+FILEStest+= err_syntax23.y
+FILEStest+= err_syntax24.y
+FILEStest+= err_syntax25.y
+FILEStest+= err_syntax26.y
+FILEStest+= err_syntax27.y
+FILEStest+= err_syntax3.y
+FILEStest+= err_syntax4.y
+FILEStest+= err_syntax5.y
+FILEStest+= err_syntax6.y
+FILEStest+= err_syntax7.y
+FILEStest+= err_syntax7a.y
+FILEStest+= err_syntax7b.y
+FILEStest+= err_syntax8.y
+FILEStest+= err_syntax8a.y
+FILEStest+= err_syntax9.y
+FILEStest+= error.y
+FILEStest+= grammar.y
+FILEStest+= inherit0.y
+FILEStest+= inherit1.y
+FILEStest+= inherit2.y
+FILEStest+= ok_syntax1.y
+FILEStest+= pure_calc.y
+FILEStest+= pure_error.y
+FILEStest+= quote_calc.y
+FILEStest+= quote_calc2.y
+FILEStest+= quote_calc3.y
+FILEStest+= quote_calc4.y
+FILEStest+= varsyntax_calc1.y
+
+FILEStest_yaccDIR= ${TESTSDIR}/yacc
-FILESDIR= ${TESTSDIR}
-FILES= calc.y
-FILES+= calc1.y
-FILES+= calc2.y
-FILES+= calc3.y
-FILES+= code_calc.y
-FILES+= code_error.y
-FILES+= error.y
-FILES+= ftp.y
-FILES+= grammar.y
-FILES+= pure_calc.y
-FILES+= pure_error.y
-FILES+= quote_calc.y
-FILES+= quote_calc2.y
-FILES+= quote_calc3.y
-FILES+= quote_calc4.y
-FILES+= regress.00.out
-FILES+= regress.01.out
-FILES+= regress.02.out
-FILES+= regress.03.out
-FILES+= regress.04.out
-FILES+= regress.05.out
-FILES+= regress.06.out
-FILES+= regress.07.out
-FILES+= regress.08.out
-FILES+= regress.09.out
-FILES+= regress.10.out
-FILES+= regress.11.out
-FILES+= regress.12.out
-FILES+= regress.13.out
-FILES+= regress.14.out
-FILES+= regress.sh
-FILES+= undefined.y
+FILEStest_yacc+= big_b.error
+FILEStest_yacc+= big_b.output
+FILEStest_yacc+= big_l.error
+FILEStest_yacc+= big_l.output
+FILEStest_yacc+= calc.error
+FILEStest_yacc+= calc.output
+FILEStest_yacc+= calc.tab.c
+FILEStest_yacc+= calc.tab.h
+FILEStest_yacc+= calc1.error
+FILEStest_yacc+= calc1.output
+FILEStest_yacc+= calc1.tab.c
+FILEStest_yacc+= calc1.tab.h
+FILEStest_yacc+= calc2.error
+FILEStest_yacc+= calc2.output
+FILEStest_yacc+= calc2.tab.c
+FILEStest_yacc+= calc2.tab.h
+FILEStest_yacc+= calc3.error
+FILEStest_yacc+= calc3.output
+FILEStest_yacc+= calc3.tab.c
+FILEStest_yacc+= calc3.tab.h
+FILEStest_yacc+= code_calc.code.c
+FILEStest_yacc+= code_calc.error
+FILEStest_yacc+= code_calc.output
+FILEStest_yacc+= code_calc.tab.c
+FILEStest_yacc+= code_calc.tab.h
+FILEStest_yacc+= code_error.code.c
+FILEStest_yacc+= code_error.error
+FILEStest_yacc+= code_error.output
+FILEStest_yacc+= code_error.tab.c
+FILEStest_yacc+= code_error.tab.h
+FILEStest_yacc+= empty.error
+FILEStest_yacc+= empty.output
+FILEStest_yacc+= empty.tab.c
+FILEStest_yacc+= empty.tab.h
+FILEStest_yacc+= err_syntax1.error
+FILEStest_yacc+= err_syntax1.output
+FILEStest_yacc+= err_syntax1.tab.c
+FILEStest_yacc+= err_syntax1.tab.h
+FILEStest_yacc+= err_syntax10.error
+FILEStest_yacc+= err_syntax10.output
+FILEStest_yacc+= err_syntax10.tab.c
+FILEStest_yacc+= err_syntax10.tab.h
+FILEStest_yacc+= err_syntax11.error
+FILEStest_yacc+= err_syntax11.output
+FILEStest_yacc+= err_syntax11.tab.c
+FILEStest_yacc+= err_syntax11.tab.h
+FILEStest_yacc+= err_syntax12.error
+FILEStest_yacc+= err_syntax12.output
+FILEStest_yacc+= err_syntax12.tab.c
+FILEStest_yacc+= err_syntax12.tab.h
+FILEStest_yacc+= err_syntax13.error
+FILEStest_yacc+= err_syntax13.output
+FILEStest_yacc+= err_syntax13.tab.c
+FILEStest_yacc+= err_syntax13.tab.h
+FILEStest_yacc+= err_syntax14.error
+FILEStest_yacc+= err_syntax14.output
+FILEStest_yacc+= err_syntax14.tab.c
+FILEStest_yacc+= err_syntax14.tab.h
+FILEStest_yacc+= err_syntax15.error
+FILEStest_yacc+= err_syntax15.output
+FILEStest_yacc+= err_syntax15.tab.c
+FILEStest_yacc+= err_syntax15.tab.h
+FILEStest_yacc+= err_syntax16.error
+FILEStest_yacc+= err_syntax16.output
+FILEStest_yacc+= err_syntax16.tab.c
+FILEStest_yacc+= err_syntax16.tab.h
+FILEStest_yacc+= err_syntax17.error
+FILEStest_yacc+= err_syntax17.output
+FILEStest_yacc+= err_syntax17.tab.c
+FILEStest_yacc+= err_syntax17.tab.h
+FILEStest_yacc+= err_syntax18.error
+FILEStest_yacc+= err_syntax18.output
+FILEStest_yacc+= err_syntax18.tab.c
+FILEStest_yacc+= err_syntax18.tab.h
+FILEStest_yacc+= err_syntax19.error
+FILEStest_yacc+= err_syntax19.output
+FILEStest_yacc+= err_syntax19.tab.c
+FILEStest_yacc+= err_syntax19.tab.h
+FILEStest_yacc+= err_syntax2.error
+FILEStest_yacc+= err_syntax2.output
+FILEStest_yacc+= err_syntax2.tab.c
+FILEStest_yacc+= err_syntax2.tab.h
+FILEStest_yacc+= err_syntax20.error
+FILEStest_yacc+= err_syntax20.output
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
