https://svn.lrde.epita.fr/svn/oln/trunk/olena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Improve sanity checks.
* tests/sanity/Makefile.am (CPPFLAGS): Rename as...
(AM_CPPFLAGS): ...this.
(check): Rename as...
(check-local): ...this.
Pass CXX and CXXFLAGS variables to includes.test through the
environment.
Protect RHS in shell variable assignments.
Makefile.am | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
Index: tests/sanity/Makefile.am
--- tests/sanity/Makefile.am (revision 841)
+++ tests/sanity/Makefile.am (working copy)
@@ -10,17 +10,19 @@
XTD_LOCAL_CPPFLAGS = -I$(top_srcdir)/extended -I$(top_builddir)/extended
STC_LOCAL_CPPFLAGS = -I$(top_srcdir)/static -I$(top_builddir)/static
MLC_LOCAL_CPPFLAGS = -I$(top_srcdir)/metalic -I$(top_builddir)/metalic
-CPPFLAGS = \
+AM_CPPFLAGS = \
-I$(srcdir)/.. \
$(OLN_LOCAL_CPPFLAGS) $(XTD_LOCAL_CPPFLAGS) \
$(STC_LOCAL_CPPFLAGS) $(MLC_LOCAL_CPPFLAGS)
-check:
- TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \
- TOP_BUILDDIR=$(top_builddir) \
- PATH_TO_OLN_SRCDIR=$(OLN_LOCAL_SRC) \
- PATH_TO_OLN_BUILDDIR=$(OLN_LOCAL_BUILD) \
- CPPFLAGS="$(CPPFLAGS) $(DEFS) -I$(top_builddir)" \
+check-local:
+ TOP_SRCDIR="$(top_srcdir)" SRCDIR="$(srcdir)" \
+ TOP_BUILDDIR="$(top_builddir)" \
+ PATH_TO_OLN_SRCDIR="$(OLN_LOCAL_SRC)" \
+ PATH_TO_OLN_BUILDDIR="$(OLN_LOCAL_BUILD)" \
+ CXX="$(CXX)" \
+ CPPFLAGS="$(CPPFLAGS) $(AM_CPPFLAGS) $(DEFS) -I$(top_builddir)" \
+ CXXFLAGS="$(CXXFLAGS) $(AM_CXXFLAGS)" \
$(SHELL) $(srcdir)/includes.test
CLEANFILES = failures incltest.*