Re: [PATCH] {maint} fix a test in header-self-contained

[Akim Demaille]

Le 3 oct. 2012 à 17:26, Theophile Ranquet a écrit :

> The previous changes seem to have introduced an issue with an include. This
> patch should address it.

Thanks!  Actually, I thought you'd post my patch too :)
The following one will be pushed before Théophile's.

commit 04a4684a513c1651c56fcc6d43e1049e5f07225d
Author: Akim Demaille <address@hidden>
Date:   Wed Oct 3 09:17:58 2012 +0200

    tests: check that headers are self contained
    
    Reported by Alexandre Duret-Lutz.
    
    * tests/headers.at (Several parsers): here.

diff --git a/THANKS b/THANKS
index 8af0abb..09d6736 100644
--- a/THANKS
+++ b/THANKS
@@ -5,7 +5,7 @@ Airy Andre                address@hidden
 Akim Demaille             address@hidden
 Albert Chin-A-Young       address@hidden
 Alexander Belopolsky      address@hidden
-Alexandre Duret-Lutz      address@hidden
+Alexandre Duret-Lutz      address@hidden
 Andreas Schwab            address@hidden
 Andrew Suffield           address@hidden
 Angelo Borsotti           address@hidden
diff --git a/tests/headers.at b/tests/headers.at
index 0524340..91fdb95 100644
--- a/tests/headers.at
+++ b/tests/headers.at
@@ -127,7 +127,8 @@ AT_SETUP([Several parsers])
 # AT_TEST([PREFIX], [DIRECTIVES])
 # -------------------------------
 # Generate and compile to *.o.  Make sure there is no (allowed) YY*
-# nor yy* identifiers in the header.
+# nor yy* identifiers in the header.  Check that headers are
+# self-contained, and can be compiled by a C++ compiler.
 m4_pushdef([AT_TEST],
 [AT_BISON_OPTION_PUSHDEFS([%define api.prefix "$1_" $2])
 AT_DATA_GRAMMAR([$1.AT_SKEL_CC_IF([yy], [y])],
@@ -242,6 +243,18 @@ AT_TEST([x8], [%define api.pure %define api.push-pull 
both])
 AT_COMPILE_CXX([parser], [[x[1-8].o -DCC_IS_CXX=$CC_IS_CXX main.cc]])
 AT_CHECK([./parser], [0], [[expout]])
 
+# Check that the headers are self-contained, and protected against
+# multiple inclusions.  While at it, check they are sane for C++.
+for h in *.h *.hh
+do
+  # No shell expansion with AT_DATA.
+  cat >$h.cc <<EOF
+#include "$h"
+#include "$h"
+EOF
+  AT_COMPILE_CXX([$h.o])
+done
+
 m4_popdef([AT_TEST])
 
 AT_CLEANUP