https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Add sanity check to Olena. * configure.ac: Configure olena/tests/check/Makefile, olena/tests/check/defs, olena/tests/sanity/Makefile and olena/tests/sanity/check. Index: olena/ChangeLog from Roland Levillain <roland@lrde.epita.fr> Add sanity check to Olena. * tests/sanity/check.in, tests/sanity/Makefile.am, * tests/check/defs.in, tests/check/Makefile.flags, * tests/check/Makefile.am: New. * tests/Makefile.am (SUBDIRS): New. configure.ac | 9 +++++- olena/ChangeLog | 9 ++++++ olena/tests/Makefile.am | 2 + olena/tests/check/Makefile.am | 56 +++++++++++++++++++++-------------------- olena/tests/sanity/Makefile.am | 16 ++++++++++- olena/tests/sanity/check.in | 7 ++--- 6 files changed, 67 insertions(+), 32 deletions(-) Index: configure.ac --- configure.ac (revision 612) +++ configure.ac (working copy) @@ -74,6 +74,13 @@ olena/oln/Makefile dynamic/Makefile ]) +# FIXME: Should be performed through oln.m4 macros. +AC_CONFIG_FILES([ + olena/tests/check/Makefile + olena/tests/check/defs + olena/tests/sanity/Makefile +]) +AC_CONFIG_FILES([olena/tests/sanity/check], + [chmod +x olena/tests/sanity/check]) -# Checks for library functions. AC_OUTPUT Index: olena/ChangeLog --- olena/ChangeLog (revision 612) +++ olena/ChangeLog (working copy) @@ -1,3 +1,12 @@ +2006-10-09 Roland Levillain <roland@lrde.epita.fr> + + Add sanity check to Olena. + + * tests/sanity/check.in, tests/sanity/Makefile.am, + * tests/check/defs.in, tests/check/Makefile.flags, + * tests/check/Makefile.am: New. + * tests/Makefile.am (SUBDIRS): New. + 2006-10-09 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> Change stc_virtual_typedef into oln_virtual_typedef. Index: olena/tests/sanity/check.in --- olena/tests/sanity/check.in (revision 612) +++ olena/tests/sanity/check.in (working copy) @@ -18,9 +18,10 @@ top_builddir=@abs_top_builddir@ file=$1 CPPFLAGS="$CPPFLAGS \ - -I$top_srcdir/metalic -I$top_builddir/metalic \ - -I$top_srcdir/integre -I$top_builddir/integre \ - -I$top_srcdir/olena -I$top_builddir/olena" + -I$top_srcdir/olena -I$top_builddir/olena \ + -I$top_srcdir/extended -I$top_builddir/extended \ + -I$top_srcdir/static -I$top_builddir/static \ + -I$top_srcdir/metalic -I$top_builddir/metalic" echo "#include <$file>" > incltest.cc if $CXX $CPPFLAGS $CXXFLAGS -c incltest.cc; then echo " PASS: $file" Index: olena/tests/sanity/Makefile.am --- olena/tests/sanity/Makefile.am (revision 612) +++ olena/tests/sanity/Makefile.am (working copy) @@ -1,4 +1,18 @@ -EXTRA_DIST = check.in includes.test +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +EXTRA_DIST = includes.test + +# FIXME: These should be defined by oln.m4. +OLN_LOCAL_SRC = $(top_srcdir)/olena +OLN_LOCAL_BUILD = $(top_builddir)/olena +# FIXME: Likewise. +OLN_LOCAL_CPPFLAGS = -I$(top_srcdir)/olena -I$(top_builddir)/olena +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 = \ + $(OLN_LOCAL_CPPFLAGS) $(XTD_LOCAL_CPPFLAGS) \ + $(STC_LOCAL_CPPFLAGS) $(MLC_LOCAL_CPPFLAGS) check: TOP_SRCDIR=$(top_srcdir) SRCDIR=$(srcdir) \ Index: olena/tests/Makefile.am --- olena/tests/Makefile.am (revision 612) +++ olena/tests/Makefile.am (working copy) @@ -1,5 +1,7 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- +SUBDIRS = check sanity + AM_CPPFLAGS = \ -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ -I$(top_srcdir)/static -I$(top_srcdir)/metalic Index: olena/tests/check/Makefile.am --- olena/tests/check/Makefile.am (revision 0) +++ olena/tests/check/Makefile.am (working copy) @@ -1,32 +1,34 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -include Makefile.flags +# FIXME: To be enabled when the test suite mechanism is available. -AM_CPPFLAGS += -DCXX=\""$(CXX)"\" \ - -DCPPFLAGS=\""$(CPPFLAGS)"\" \ - -DCXXFLAGS=\""$(CXXFLAGS)"\" \ - -DOLN_EXTRA_CPPFLAGS=\""$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS)"\" \ - -DCXXFLAGS_OPTIMIZE=\""$(CXXFLAGS_OPTIMIZE)"\" \ - -DCXXFLAGS_STRICT=\""$(CXXFLAGS_STRICT)"\" \ - -DCXXFLAGS_STRICT_ERRORS=\""$(CXXFLAGS_STRICT_ERRORS)"\" \ - -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" - -check_LIBRARIES = libolncheck.a - -COMMON_CHECK_SOURCES = \ - $(top_srcdir)/metalic/tests/check/check.hh \ - $(top_srcdir)/metalic/tests/check/main.cc \ - $(top_srcdir)/metalic/tests/check/srcdir.cc \ - $(top_srcdir)/metalic/tests/check/srcdir.hh \ - $(top_srcdir)/metalic/tests/check/verbose.cc \ - $(top_srcdir)/metalic/tests/check/verbose.hh \ - $(top_srcdir)/metalic/tests/check/compile.cc \ - $(top_srcdir)/metalic/tests/check/compile.hh - -libolncheck_a_SOURCES = \ - data.hh \ - data.cc \ - $(COMMON_CHECK_SOURCES) +# include Makefile.flags +# AM_CPPFLAGS += -DCXX=\""$(CXX)"\" \ +# -DCPPFLAGS=\""$(CPPFLAGS)"\" \ +# -DCXXFLAGS=\""$(CXXFLAGS)"\" \ +# -DOLN_EXTRA_CPPFLAGS=\""$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS)"\" \ +# -DCXXFLAGS_OPTIMIZE=\""$(CXXFLAGS_OPTIMIZE)"\" \ +# -DCXXFLAGS_STRICT=\""$(CXXFLAGS_STRICT)"\" \ +# -DCXXFLAGS_STRICT_ERRORS=\""$(CXXFLAGS_STRICT_ERRORS)"\" \ +# -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# check_LIBRARIES = libolncheck.a + +# COMMON_CHECK_SOURCES = \ +# $(top_srcdir)/metalic/tests/check/check.hh \ +# $(top_srcdir)/metalic/tests/check/main.cc \ +# $(top_srcdir)/metalic/tests/check/srcdir.cc \ +# $(top_srcdir)/metalic/tests/check/srcdir.hh \ +# $(top_srcdir)/metalic/tests/check/verbose.cc \ +# $(top_srcdir)/metalic/tests/check/verbose.hh \ +# $(top_srcdir)/metalic/tests/check/compile.cc \ +# $(top_srcdir)/metalic/tests/check/compile.hh + +# libolncheck_a_SOURCES = \ +# data.hh \ +# data.cc \ +# $(COMMON_CHECK_SOURCES) -EXTRA_DIST = Makefile.flags Makefile.check Makefile.runtests + +# EXTRA_DIST = Makefile.flags Makefile.check Makefile.runtests