From: Akim Demaille <akim@lrde.epita.fr>
Date: Mon, 12 Nov 2012 08:06:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/branch-2.6' into maint
X-Git-Tag: v2.6.90~45
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/9bf1eca7c9e24c94f5a7b336ed7cc041586cb905

Merge remote-tracking branch 'origin/branch-2.6' into maint

* origin/branch-2.6:
  tests: use valgrind where appropriate
  tests: don't expect $EGREP to support -w
---

9bf1eca7c9e24c94f5a7b336ed7cc041586cb905
diff --cc tests/headers.at
index 8a05d34d,b53ee8a0..dcf09a72
--- a/tests/headers.at
+++ b/tests/headers.at
@@@ -161,23 -161,8 +161,8 @@@ exp
  ]AT_YYLEX_DEFINE(["$1"])[
  ]])
  
 -AT_BISON_CHECK([-d -o AT_SKEL_CC_IF([$1.cc $1.yy], [$1.c $1.y])])
 +AT_BISON_CHECK([-d -o $1.AT_SKEL_CC_IF([cc], [c]) $1.y])
  
- # Check there is no 'yy' left.
- # C++ output relies on namespaces and still uses yy a lot.
- AT_SKEL_CC_IF([],
-   [AT_CHECK([$EGREP yy $1.h], [1])])
- 
- # Check there is not 'YY' left.
- # Ignore comments, YYPARSE_PARAM (obsolete), YYPUSH_MORE(_DEFINED)?
- # (constant definition), YY_\w+_INCLUDED (header guards).
- #
- # YYDEBUG (not renamed) can be read, but not changed.
- AT_CHECK([[sed -ne 's,/\*[^*]*\*/,,g;s,//.*,,' \
-                 -e '/YY/p' ]$1.AT_SKEL_CC_IF([hh], [h])[ |
-      $EGREP -wv 'YY(PARSE_PARAM|PUSH_MORE(_DEFINED)?|_[0-9A-Z_]+_INCLUDED)|(defined|if) YYDEBUG']],
-          [1])
- 
  AT_LANG_COMPILE([$1.o])
  AT_CHECK([[echo "$1" >>expout]])