Imported Upstream version 20140715upstream/20140715

71 files changed, 96 insertions, 95 deletions

diff --git a/test/btyacc/big_b.output b/test/btyacc/big_b.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/big_b.output
+++ b/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/test/btyacc/big_l.output b/test/btyacc/big_l.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/big_l.output
+++ b/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/test/btyacc/err_inherit1.error b/test/btyacc/err_inherit1.error
index 1d662b6..203b906 100644
--- a/test/btyacc/err_inherit1.error
+++ b/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/test/btyacc/err_inherit2.error b/test/btyacc/err_inherit2.error
index a3fa54a..c016b63 100644
--- a/test/btyacc/err_inherit2.error
+++ b/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/test/btyacc/err_inherit3.error b/test/btyacc/err_inherit3.error
index 6e27dd0..e0ab28a 100644
--- a/test/btyacc/err_inherit3.error
+++ b/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/test/btyacc/err_inherit4.error b/test/btyacc/err_inherit4.error
index 00eb989..20aa216 100644
--- a/test/btyacc/err_inherit4.error
+++ b/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/test/btyacc/err_inherit5.error b/test/btyacc/err_inherit5.error
index edc58c9..ceabc34 100644
--- a/test/btyacc/err_inherit5.error
+++ b/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/test/btyacc/err_syntax1.error b/test/btyacc/err_syntax1.error
index e3a341d..5df5c22 100644
--- a/test/btyacc/err_syntax1.error
+++ b/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/test/btyacc/err_syntax10.error b/test/btyacc/err_syntax10.error
index ceb876e..61a72c0 100644
--- a/test/btyacc/err_syntax10.error
+++ b/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/test/btyacc/err_syntax11.error b/test/btyacc/err_syntax11.error
index df0aee4..b2dd79c 100644
--- a/test/btyacc/err_syntax11.error
+++ b/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/test/btyacc/err_syntax12.error b/test/btyacc/err_syntax12.error
index 9399e82..358960b 100644
--- a/test/btyacc/err_syntax12.error
+++ b/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/test/btyacc/err_syntax13.error b/test/btyacc/err_syntax13.error
index dd06256..9ffa8b4 100644
--- a/test/btyacc/err_syntax13.error
+++ b/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/test/btyacc/err_syntax14.error b/test/btyacc/err_syntax14.error
index 787a217..73e9f7c 100644
--- a/test/btyacc/err_syntax14.error
+++ b/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/test/btyacc/err_syntax15.error b/test/btyacc/err_syntax15.error
index 63600f1..36dc03f 100644
--- a/test/btyacc/err_syntax15.error
+++ b/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/test/btyacc/err_syntax16.error b/test/btyacc/err_syntax16.error
index b8dd094..6ff1589 100644
--- a/test/btyacc/err_syntax16.error
+++ b/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/test/btyacc/err_syntax17.error b/test/btyacc/err_syntax17.error
index 24032f6..8a8b64b 100644
--- a/test/btyacc/err_syntax17.error
+++ b/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/test/btyacc/err_syntax18.error b/test/btyacc/err_syntax18.error
index 305b4cf..c52fd71 100644
--- a/test/btyacc/err_syntax18.error
+++ b/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/test/btyacc/err_syntax19.error b/test/btyacc/err_syntax19.error
index 895c8fe..2499b7f 100644
--- a/test/btyacc/err_syntax19.error
+++ b/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/test/btyacc/err_syntax2.error b/test/btyacc/err_syntax2.error
index fefda9f..29fe56c 100644
--- a/test/btyacc/err_syntax2.error
+++ b/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/test/btyacc/err_syntax21.error b/test/btyacc/err_syntax21.error
index 162d82d..9b0dc17 100644
--- a/test/btyacc/err_syntax21.error
+++ b/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/test/btyacc/err_syntax22.error b/test/btyacc/err_syntax22.error
index 9c71619..8622aa7 100644
--- a/test/btyacc/err_syntax22.error
+++ b/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/test/btyacc/err_syntax23.error b/test/btyacc/err_syntax23.error
index bcde6e7..3ccbbd1 100644
--- a/test/btyacc/err_syntax23.error
+++ b/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/test/btyacc/err_syntax24.error b/test/btyacc/err_syntax24.error
index bdd3aed..c153889 100644
--- a/test/btyacc/err_syntax24.error
+++ b/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/test/btyacc/err_syntax25.error b/test/btyacc/err_syntax25.error
index ea45a70..234a7b9 100644
--- a/test/btyacc/err_syntax25.error
+++ b/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/test/btyacc/err_syntax26.error b/test/btyacc/err_syntax26.error
index cddd574..c9a09ad 100644
--- a/test/btyacc/err_syntax26.error
+++ b/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/test/btyacc/err_syntax27.error b/test/btyacc/err_syntax27.error
index 4737f99..2a27708 100644
--- a/test/btyacc/err_syntax27.error
+++ b/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/test/btyacc/err_syntax3.error b/test/btyacc/err_syntax3.error
index 6926214..7e4871b 100644
--- a/test/btyacc/err_syntax3.error
+++ b/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/test/btyacc/err_syntax4.error b/test/btyacc/err_syntax4.error
index 72b683e..6a10d40 100644
--- a/test/btyacc/err_syntax4.error
+++ b/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/test/btyacc/err_syntax5.error b/test/btyacc/err_syntax5.error
index fd3bf0d..37a8500 100644
--- a/test/btyacc/err_syntax5.error
+++ b/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/test/btyacc/err_syntax6.error b/test/btyacc/err_syntax6.error
index ae83bd2..bde624a 100644
--- a/test/btyacc/err_syntax6.error
+++ b/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/test/btyacc/err_syntax7.error b/test/btyacc/err_syntax7.error
index fb63422..ce5717e 100644
--- a/test/btyacc/err_syntax7.error
+++ b/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/test/btyacc/err_syntax7a.error b/test/btyacc/err_syntax7a.error
index f6adba6..213711e 100644
--- a/test/btyacc/err_syntax7a.error
+++ b/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/test/btyacc/err_syntax7b.error b/test/btyacc/err_syntax7b.error
index f3e512f..19b617c 100644
--- a/test/btyacc/err_syntax7b.error
+++ b/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/test/btyacc/err_syntax8.error b/test/btyacc/err_syntax8.error
index 53a3a32..c6a4cc9 100644
--- a/test/btyacc/err_syntax8.error
+++ b/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/test/btyacc/err_syntax8a.error b/test/btyacc/err_syntax8a.error
index 3135551..ed503e9 100644
--- a/test/btyacc/err_syntax8a.error
+++ b/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/test/btyacc/err_syntax9.error b/test/btyacc/err_syntax9.error
index 43696bd..1f74b7e 100644
--- a/test/btyacc/err_syntax9.error
+++ b/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/test/btyacc/help.output b/test/btyacc/help.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/help.output
+++ b/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/test/btyacc/no_b_opt.output b/test/btyacc/no_b_opt.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/no_b_opt.output
+++ b/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/test/btyacc/no_output2.output b/test/btyacc/no_output2.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/no_output2.output
+++ b/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/test/btyacc/no_p_opt.output b/test/btyacc/no_p_opt.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/no_p_opt.output
+++ b/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/test/btyacc/nostdin.output b/test/btyacc/nostdin.output
index 28e4555..112b7c7 100644
--- a/test/btyacc/nostdin.output
+++ b/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
diff --git a/test/run_test.sh b/test/run_test.sh
index d9faf0b..22ac61d 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -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
diff --git a/test/yacc/err_syntax1.error b/test/yacc/err_syntax1.error
index e3a341d..5df5c22 100644
--- a/test/yacc/err_syntax1.error
+++ b/test/yacc/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/test/yacc/err_syntax10.error b/test/yacc/err_syntax10.error
index ceb876e..61a72c0 100644
--- a/test/yacc/err_syntax10.error
+++ b/test/yacc/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/test/yacc/err_syntax11.error b/test/yacc/err_syntax11.error
index df0aee4..b2dd79c 100644
--- a/test/yacc/err_syntax11.error
+++ b/test/yacc/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/test/yacc/err_syntax12.error b/test/yacc/err_syntax12.error
index 9399e82..358960b 100644
--- a/test/yacc/err_syntax12.error
+++ b/test/yacc/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/test/yacc/err_syntax13.error b/test/yacc/err_syntax13.error
index dd06256..9ffa8b4 100644
--- a/test/yacc/err_syntax13.error
+++ b/test/yacc/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/test/yacc/err_syntax14.error b/test/yacc/err_syntax14.error
index 787a217..73e9f7c 100644
--- a/test/yacc/err_syntax14.error
+++ b/test/yacc/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/test/yacc/err_syntax15.error b/test/yacc/err_syntax15.error
index 63600f1..36dc03f 100644
--- a/test/yacc/err_syntax15.error
+++ b/test/yacc/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/test/yacc/err_syntax16.error b/test/yacc/err_syntax16.error
index b8dd094..6ff1589 100644
--- a/test/yacc/err_syntax16.error
+++ b/test/yacc/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/test/yacc/err_syntax17.error b/test/yacc/err_syntax17.error
index 24032f6..8a8b64b 100644
--- a/test/yacc/err_syntax17.error
+++ b/test/yacc/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/test/yacc/err_syntax18.error b/test/yacc/err_syntax18.error
index 305b4cf..c52fd71 100644
--- a/test/yacc/err_syntax18.error
+++ b/test/yacc/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/test/yacc/err_syntax19.error b/test/yacc/err_syntax19.error
index 895c8fe..2499b7f 100644
--- a/test/yacc/err_syntax19.error
+++ b/test/yacc/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/test/yacc/err_syntax2.error b/test/yacc/err_syntax2.error
index fefda9f..29fe56c 100644
--- a/test/yacc/err_syntax2.error
+++ b/test/yacc/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/test/yacc/err_syntax21.error b/test/yacc/err_syntax21.error
index 162d82d..9b0dc17 100644
--- a/test/yacc/err_syntax21.error
+++ b/test/yacc/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/test/yacc/err_syntax22.error b/test/yacc/err_syntax22.error
index 9c71619..8622aa7 100644
--- a/test/yacc/err_syntax22.error
+++ b/test/yacc/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/test/yacc/err_syntax23.error b/test/yacc/err_syntax23.error
index bcde6e7..3ccbbd1 100644
--- a/test/yacc/err_syntax23.error
+++ b/test/yacc/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/test/yacc/err_syntax24.error b/test/yacc/err_syntax24.error
index bdd3aed..c153889 100644
--- a/test/yacc/err_syntax24.error
+++ b/test/yacc/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/test/yacc/err_syntax25.error b/test/yacc/err_syntax25.error
index ea45a70..234a7b9 100644
--- a/test/yacc/err_syntax25.error
+++ b/test/yacc/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/test/yacc/err_syntax26.error b/test/yacc/err_syntax26.error
index cddd574..c9a09ad 100644
--- a/test/yacc/err_syntax26.error
+++ b/test/yacc/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/test/yacc/err_syntax27.error b/test/yacc/err_syntax27.error
index 4737f99..2a27708 100644
--- a/test/yacc/err_syntax27.error
+++ b/test/yacc/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/test/yacc/err_syntax3.error b/test/yacc/err_syntax3.error
index 6926214..7e4871b 100644
--- a/test/yacc/err_syntax3.error
+++ b/test/yacc/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/test/yacc/err_syntax4.error b/test/yacc/err_syntax4.error
index 72b683e..6a10d40 100644
--- a/test/yacc/err_syntax4.error
+++ b/test/yacc/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/test/yacc/err_syntax5.error b/test/yacc/err_syntax5.error
index fd3bf0d..37a8500 100644
--- a/test/yacc/err_syntax5.error
+++ b/test/yacc/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/test/yacc/err_syntax6.error b/test/yacc/err_syntax6.error
index ae83bd2..bde624a 100644
--- a/test/yacc/err_syntax6.error
+++ b/test/yacc/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/test/yacc/err_syntax7.error b/test/yacc/err_syntax7.error
index fb63422..ce5717e 100644
--- a/test/yacc/err_syntax7.error
+++ b/test/yacc/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/test/yacc/err_syntax7a.error b/test/yacc/err_syntax7a.error
index f6adba6..213711e 100644
--- a/test/yacc/err_syntax7a.error
+++ b/test/yacc/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/test/yacc/err_syntax7b.error b/test/yacc/err_syntax7b.error
index f3e512f..19b617c 100644
--- a/test/yacc/err_syntax7b.error
+++ b/test/yacc/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/test/yacc/err_syntax8.error b/test/yacc/err_syntax8.error
index 53a3a32..c6a4cc9 100644
--- a/test/yacc/err_syntax8.error
+++ b/test/yacc/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/test/yacc/err_syntax8a.error b/test/yacc/err_syntax8a.error
index 3135551..ed503e9 100644
--- a/test/yacc/err_syntax8a.error
+++ b/test/yacc/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/test/yacc/err_syntax9.error b/test/yacc/err_syntax9.error
index 43696bd..1f74b7e 100644
--- a/test/yacc/err_syntax9.error
+++ b/test/yacc/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