aboutsummaryrefslogtreecommitdiff
path: root/contrib/byacc/test/btyacc
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/byacc/test/btyacc')
-rw-r--r--contrib/byacc/test/btyacc/big_b.output1
-rw-r--r--contrib/byacc/test/btyacc/big_l.output1
-rw-r--r--contrib/byacc/test/btyacc/err_inherit1.error2
-rw-r--r--contrib/byacc/test/btyacc/err_inherit2.error6
-rw-r--r--contrib/byacc/test/btyacc/err_inherit3.error22
-rw-r--r--contrib/byacc/test/btyacc/err_inherit4.error10
-rw-r--r--contrib/byacc/test/btyacc/err_inherit5.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax1.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax10.error6
-rw-r--r--contrib/byacc/test/btyacc/err_syntax11.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax12.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax13.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax14.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax15.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax16.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax17.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax18.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax19.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax2.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax21.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax22.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax23.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax24.error4
-rw-r--r--contrib/byacc/test/btyacc/err_syntax25.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax26.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax27.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax3.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax4.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax5.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax6.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax7.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax7a.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax7b.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax8.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax8a.error2
-rw-r--r--contrib/byacc/test/btyacc/err_syntax9.error2
-rw-r--r--contrib/byacc/test/btyacc/help.output1
-rw-r--r--contrib/byacc/test/btyacc/no_b_opt.output1
-rw-r--r--contrib/byacc/test/btyacc/no_output2.output1
-rw-r--r--contrib/byacc/test/btyacc/no_p_opt.output1
-rw-r--r--contrib/byacc/test/btyacc/nostdin.output1
41 files changed, 53 insertions, 60 deletions
diff --git a/contrib/byacc/test/btyacc/big_b.output b/contrib/byacc/test/btyacc/big_b.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/big_b.output
+++ b/contrib/byacc/test/btyacc/big_b.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/big_l.output b/contrib/byacc/test/btyacc/big_l.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/big_l.output
+++ b/contrib/byacc/test/btyacc/big_l.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_inherit1.error b/contrib/byacc/test/btyacc/err_inherit1.error
index 1d662b649485..203b9063e908 100644
--- a/contrib/byacc/test/btyacc/err_inherit1.error
+++ b/contrib/byacc/test/btyacc/err_inherit1.error
@@ -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
^
diff --git a/contrib/byacc/test/btyacc/err_inherit2.error b/contrib/byacc/test/btyacc/err_inherit2.error
index a3fa54a4ff73..c016b63f179d 100644
--- a/contrib/byacc/test/btyacc/err_inherit2.error
+++ b/contrib/byacc/test/btyacc/err_inherit2.error
@@ -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
^
diff --git a/contrib/byacc/test/btyacc/err_inherit3.error b/contrib/byacc/test/btyacc/err_inherit3.error
index 6e27dd0504c5..e0ab28a91799 100644
--- a/contrib/byacc/test/btyacc/err_inherit3.error
+++ b/contrib/byacc/test/btyacc/err_inherit3.error
@@ -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.
diff --git a/contrib/byacc/test/btyacc/err_inherit4.error b/contrib/byacc/test/btyacc/err_inherit4.error
index 00eb9890a533..20aa216ba239 100644
--- a/contrib/byacc/test/btyacc/err_inherit4.error
+++ b/contrib/byacc/test/btyacc/err_inherit4.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_inherit5.error b/contrib/byacc/test/btyacc/err_inherit5.error
index edc58c984c59..ceabc34591b2 100644
--- a/contrib/byacc/test/btyacc/err_inherit5.error
+++ b/contrib/byacc/test/btyacc/err_inherit5.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax1.error b/contrib/byacc/test/btyacc/err_syntax1.error
index e3a341d4ee3d..5df5c22ef17b 100644
--- a/contrib/byacc/test/btyacc/err_syntax1.error
+++ b/contrib/byacc/test/btyacc/err_syntax1.error
@@ -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
?% {
^
diff --git a/contrib/byacc/test/btyacc/err_syntax10.error b/contrib/byacc/test/btyacc/err_syntax10.error
index ceb876ec6037..61a72c0408af 100644
--- a/contrib/byacc/test/btyacc/err_syntax10.error
+++ b/contrib/byacc/test/btyacc/err_syntax10.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax11.error b/contrib/byacc/test/btyacc/err_syntax11.error
index df0aee4fb588..b2dd79c50504 100644
--- a/contrib/byacc/test/btyacc/err_syntax11.error
+++ b/contrib/byacc/test/btyacc/err_syntax11.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax12.error b/contrib/byacc/test/btyacc/err_syntax12.error
index 9399e82e1d76..358960bdb9ec 100644
--- a/contrib/byacc/test/btyacc/err_syntax12.error
+++ b/contrib/byacc/test/btyacc/err_syntax12.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax13.error b/contrib/byacc/test/btyacc/err_syntax13.error
index dd062569c1dc..9ffa8b40c271 100644
--- a/contrib/byacc/test/btyacc/err_syntax13.error
+++ b/contrib/byacc/test/btyacc/err_syntax13.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax14.error b/contrib/byacc/test/btyacc/err_syntax14.error
index 787a21760b3d..73e9f7c8319f 100644
--- a/contrib/byacc/test/btyacc/err_syntax14.error
+++ b/contrib/byacc/test/btyacc/err_syntax14.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax15.error b/contrib/byacc/test/btyacc/err_syntax15.error
index 63600f1bd126..36dc03fef8bb 100644
--- a/contrib/byacc/test/btyacc/err_syntax15.error
+++ b/contrib/byacc/test/btyacc/err_syntax15.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax16.error b/contrib/byacc/test/btyacc/err_syntax16.error
index b8dd094b9409..6ff158970452 100644
--- a/contrib/byacc/test/btyacc/err_syntax16.error
+++ b/contrib/byacc/test/btyacc/err_syntax16.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax17.error b/contrib/byacc/test/btyacc/err_syntax17.error
index 24032f613202..8a8b64b07123 100644
--- a/contrib/byacc/test/btyacc/err_syntax17.error
+++ b/contrib/byacc/test/btyacc/err_syntax17.error
@@ -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
^
diff --git a/contrib/byacc/test/btyacc/err_syntax18.error b/contrib/byacc/test/btyacc/err_syntax18.error
index 305b4cf45e3c..c52fd71a1ecb 100644
--- a/contrib/byacc/test/btyacc/err_syntax18.error
+++ b/contrib/byacc/test/btyacc/err_syntax18.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax19.error b/contrib/byacc/test/btyacc/err_syntax19.error
index 895c8fe16264..2499b7fc4f13 100644
--- a/contrib/byacc/test/btyacc/err_syntax19.error
+++ b/contrib/byacc/test/btyacc/err_syntax19.error
@@ -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>; }
^
diff --git a/contrib/byacc/test/btyacc/err_syntax2.error b/contrib/byacc/test/btyacc/err_syntax2.error
index fefda9fcf445..29fe56c28b48 100644
--- a/contrib/byacc/test/btyacc/err_syntax2.error
+++ b/contrib/byacc/test/btyacc/err_syntax2.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
%{ /*
^
diff --git a/contrib/byacc/test/btyacc/err_syntax21.error b/contrib/byacc/test/btyacc/err_syntax21.error
index 162d82d0c96d..9b0dc17b6629 100644
--- a/contrib/byacc/test/btyacc/err_syntax21.error
+++ b/contrib/byacc/test/btyacc/err_syntax21.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax22.error b/contrib/byacc/test/btyacc/err_syntax22.error
index 9c71619c4e25..8622aa73f598 100644
--- a/contrib/byacc/test/btyacc/err_syntax22.error
+++ b/contrib/byacc/test/btyacc/err_syntax22.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax23.error b/contrib/byacc/test/btyacc/err_syntax23.error
index bcde6e7fac40..3ccbbd1fee8f 100644
--- a/contrib/byacc/test/btyacc/err_syntax23.error
+++ b/contrib/byacc/test/btyacc/err_syntax23.error
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
diff --git a/contrib/byacc/test/btyacc/err_syntax24.error b/contrib/byacc/test/btyacc/err_syntax24.error
index bdd3aeda0db3..c1538898ce0b 100644
--- a/contrib/byacc/test/btyacc/err_syntax24.error
+++ b/contrib/byacc/test/btyacc/err_syntax24.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax25.error b/contrib/byacc/test/btyacc/err_syntax25.error
index ea45a70310de..234a7b9fcd3c 100644
--- a/contrib/byacc/test/btyacc/err_syntax25.error
+++ b/contrib/byacc/test/btyacc/err_syntax25.error
@@ -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 {
^
diff --git a/contrib/byacc/test/btyacc/err_syntax26.error b/contrib/byacc/test/btyacc/err_syntax26.error
index cddd5741bf7a..c9a09ad19929 100644
--- a/contrib/byacc/test/btyacc/err_syntax26.error
+++ b/contrib/byacc/test/btyacc/err_syntax26.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax27.error b/contrib/byacc/test/btyacc/err_syntax27.error
index 4737f99b9a37..2a277087c356 100644
--- a/contrib/byacc/test/btyacc/err_syntax27.error
+++ b/contrib/byacc/test/btyacc/err_syntax27.error
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
diff --git a/contrib/byacc/test/btyacc/err_syntax3.error b/contrib/byacc/test/btyacc/err_syntax3.error
index 6926214f5e7b..7e4871b87ad2 100644
--- a/contrib/byacc/test/btyacc/err_syntax3.error
+++ b/contrib/byacc/test/btyacc/err_syntax3.error
@@ -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> '(' '*' '&
^
diff --git a/contrib/byacc/test/btyacc/err_syntax4.error b/contrib/byacc/test/btyacc/err_syntax4.error
index 72b683ee7d4b..6a10d4040eb5 100644
--- a/contrib/byacc/test/btyacc/err_syntax4.error
+++ b/contrib/byacc/test/btyacc/err_syntax4.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
%{
^
diff --git a/contrib/byacc/test/btyacc/err_syntax5.error b/contrib/byacc/test/btyacc/err_syntax5.error
index fd3bf0df6b9f..37a8500b053a 100644
--- a/contrib/byacc/test/btyacc/err_syntax5.error
+++ b/contrib/byacc/test/btyacc/err_syntax5.error
@@ -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 {
^
diff --git a/contrib/byacc/test/btyacc/err_syntax6.error b/contrib/byacc/test/btyacc/err_syntax6.error
index ae83bd2a3735..bde624a71599 100644
--- a/contrib/byacc/test/btyacc/err_syntax6.error
+++ b/contrib/byacc/test/btyacc/err_syntax6.error
@@ -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) '(' '*' '&
^
diff --git a/contrib/byacc/test/btyacc/err_syntax7.error b/contrib/byacc/test/btyacc/err_syntax7.error
index fb6342288f52..ce5717e775e8 100644
--- a/contrib/byacc/test/btyacc/err_syntax7.error
+++ b/contrib/byacc/test/btyacc/err_syntax7.error
@@ -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'
^
diff --git a/contrib/byacc/test/btyacc/err_syntax7a.error b/contrib/byacc/test/btyacc/err_syntax7a.error
index f6adba64ddc1..213711e11ff0 100644
--- a/contrib/byacc/test/btyacc/err_syntax7a.error
+++ b/contrib/byacc/test/btyacc/err_syntax7a.error
@@ -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'
^
diff --git a/contrib/byacc/test/btyacc/err_syntax7b.error b/contrib/byacc/test/btyacc/err_syntax7b.error
index f3e512fd1a71..19b617ccca1c 100644
--- a/contrib/byacc/test/btyacc/err_syntax7b.error
+++ b/contrib/byacc/test/btyacc/err_syntax7b.error
@@ -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.'
^
diff --git a/contrib/byacc/test/btyacc/err_syntax8.error b/contrib/byacc/test/btyacc/err_syntax8.error
index 53a3a328d05e..c6a4cc943fa2 100644
--- a/contrib/byacc/test/btyacc/err_syntax8.error
+++ b/contrib/byacc/test/btyacc/err_syntax8.error
@@ -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 .
diff --git a/contrib/byacc/test/btyacc/err_syntax8a.error b/contrib/byacc/test/btyacc/err_syntax8a.error
index 3135551633f0..ed503e90451b 100644
--- a/contrib/byacc/test/btyacc/err_syntax8a.error
+++ b/contrib/byacc/test/btyacc/err_syntax8a.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/err_syntax9.error b/contrib/byacc/test/btyacc/err_syntax9.error
index 43696bd1f4c3..1f74b7ea0a26 100644
--- a/contrib/byacc/test/btyacc/err_syntax9.error
+++ b/contrib/byacc/test/btyacc/err_syntax9.error
@@ -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
diff --git a/contrib/byacc/test/btyacc/help.output b/contrib/byacc/test/btyacc/help.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/help.output
+++ b/contrib/byacc/test/btyacc/help.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/no_b_opt.output b/contrib/byacc/test/btyacc/no_b_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_b_opt.output
+++ b/contrib/byacc/test/btyacc/no_b_opt.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/no_output2.output b/contrib/byacc/test/btyacc/no_output2.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_output2.output
+++ b/contrib/byacc/test/btyacc/no_output2.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/no_p_opt.output b/contrib/byacc/test/btyacc/no_p_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_p_opt.output
+++ b/contrib/byacc/test/btyacc/no_p_opt.output
@@ -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
diff --git a/contrib/byacc/test/btyacc/nostdin.output b/contrib/byacc/test/btyacc/nostdin.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/nostdin.output
+++ b/contrib/byacc/test/btyacc/nostdin.output
@@ -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