Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / bison.in

diff --git a/tests/bison.in b/tests/bison.in
index 9e1709acfa9eabea3c94295eeb7977745e64cbb9..b8e0e057817aefbafda3ec0630a4d86624956890 100644 (file)
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -19,26 +19,14 @@
 
 abs_top_srcdir='@abs_top_srcdir@'
 abs_top_builddir='@abs_top_builddir@'
-
-: ${PERL=perl}
+: ${PERL='@PERL@'}
 
 # Use the shipped files, not those installed.
 BISON_PKGDATADIR=$abs_top_srcdir/data
 export BISON_PKGDATADIR
 
-trap 'rm -f /tmp/bison.$$.*; exit $status' 0 1 2 13 15
-$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"} 2>/tmp/bison.$$.err
+$PREBISON "$abs_top_builddir/src/bison" ${1+"$@"}
 status=$?
-# Protect from gettextized quotes.  See quotearg.c's gettext_quote for
-# the UTF-8 sequences.  For context, see
-# http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html
-#
-# In UTF-8 the quoting quote are not ', so bison use them to quote the
-# ' character.  When using ASCII quotes, bison issues "'".
-$PERL -p                                                                \
-  -e "s{\\xe2\\x80\\x98|\\xe2\\x80\\x99|\\xa1\\ae|\\xa1\\xaf}{'}g;"     \
-  -e "s{'''}{\"'\"}g;"                                                  \
-  /tmp/bison.$$.err >&2
 
 # As a special dark magic, if we are actually using this wrapper to
 # compile Bison's src/parse-gram.y, post-process the synclines to
@@ -52,8 +40,9 @@ do
       # post-processes the synclines on y.tab.c itself.  Don't let it
       # do it.  Besides, it leaves "parse-gram.y" as the source,
       # dropping the src/ part.
-      $PERL -pi -e 's{"y\.tab\.}{"src/parse-gram.}g;'    \
-                -e 's{".*/(parse-gram\.y)"}{"src/$1"}g;' \
+      $PERL -pi -e 's{"y\.tab\.}{"src/parse-gram.}g;'           \
+                -e 's{".*/(parse-gram\.y)"}{"src/$1"}g;'        \
+                -e 's{GRAM_Y_TAB_H}{GRAM_SRC_PARSE_GRAM_H}g;'        \
            y.tab.[ch]
     fi
     ;;