https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Organize the tests into a hierarchy. * tests/fill.cc: Move file... * tests/algorithms/fill.cc: ...here. * tests/at.cc, tests/dpoint2d.cc, tests/grid.cc, tests/image1d.cc, * tests/image2d.cc, tests/image3d.cc, tests/image_entry.cc, * tests/npoints.cc, tests/point2d.cc, tests/window2d.cc: Move files... * tests/core/at.cc, tests/core/dpoint2d.cc, tests/core/grid.cc, * tests/core/image1d.cc, tests/core/image2d.cc, * tests/core/image3d.cc, tests/core/image_entry.cc, * tests/core/npoints.cc, tests/core/point2d.cc, * tests/core/window2d.cc: ...here. * tests/io_pnm.cc: Move file... * tests/io/io_pnm.cc: ...here. * tests/add_neighborhood_morpher.cc, tests/identity_morpher.cc, * tests/morphers.cc, tests/value_cast.cc: Move files... * tests/morphers/add_neighborhood_morpher.cc, * tests/morphers/identity_morpher.cc, tests/morphers/morphers.cc, * tests/morphers/value_cast.cc:: ...here. * tests/grey.cc: Move file... * tests/value/grey.cc: ...here. * tests/algorithms/Makefile.am, tests/core/Makefile.am, * tests/io/Makefile.am, tests/morphers/Makefile.am, * tests/value/Makefile.am: New. * tests/Makefile.am: Adjust. * tests/sanity/Makefile.am (CPPFLAGS): Add `-I$(srcdir)/..'. * oln/Makefile.am: Remove core/automatic/image/image_being_mutable.hh. Add core/automatic/image/mutable_image.hh. oln/Makefile.am | 2 - tests/Makefile.am | 75 +------------------------------------------ tests/algorithms/Makefile.am | 32 ++++++++++++++++++ tests/core/Makefile.am | 49 ++++++++++++++++++++++++++++ tests/io/Makefile.am | 28 ++++++++++++++++ tests/morphers/Makefile.am | 34 +++++++++++++++++++ tests/sanity/Makefile.am | 1 tests/value/Makefile.am | 28 ++++++++++++++++ 8 files changed, 175 insertions(+), 74 deletions(-) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 0) +++ tests/core/Makefile.am (revision 0) @@ -0,0 +1,49 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Revamp (see Olena 0.10's test suite). + +AM_CPPFLAGS = \ + -I$(srcdir)/.. -I$(srcdir)/../check \ + -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ + -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ + -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution. +# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will +# warn against this, but that's OK). +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +CXXFLAGS += $(TESTS_CXXFLAGS) + +check_PROGRAMS = \ + dpoint2d \ + point2d \ + grid \ + image_entry \ + image1d \ + image2d \ + image3d \ + npoints \ + window2d \ + \ + at + +# Images and auxiliary structures. +dpoint2d_SOURCES = dpoint2d.cc +point2d_SOURCES = point2d.cc +grid_SOURCES = grid.cc +image_entry_SOURCES = image_entry.cc +image1d_SOURCES = image1d.cc +image2d_SOURCES = image2d.cc +image3d_SOURCES = image3d.cc +npoints_SOURCES = npoints.cc +window2d_SOURCES = window2d.cc + +# Methods. +at_SOURCES = at.cc + + +TESTS = $(check_PROGRAMS) Index: tests/morphers/Makefile.am --- tests/morphers/Makefile.am (revision 0) +++ tests/morphers/Makefile.am (revision 0) @@ -0,0 +1,34 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Revamp (see Olena 0.10's test suite). + +AM_CPPFLAGS = \ + -I$(srcdir)/.. -I$(srcdir)/../check \ + -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ + -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ + -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution. +# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will +# warn against this, but that's OK). +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +CXXFLAGS += $(TESTS_CXXFLAGS) + +check_PROGRAMS = \ + identity_morpher \ + add_neighborhood_morpher \ + value_cast \ + morphers + +# Morphers. +identity_morpher_SOURCES = identity_morpher.cc +add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc +value_cast_SOURCES = value_cast.cc +morphers_SOURCES = morphers.cc + + +TESTS = $(check_PROGRAMS) Index: tests/sanity/Makefile.am --- tests/sanity/Makefile.am (revision 653) +++ tests/sanity/Makefile.am (working copy) @@ -11,6 +11,7 @@ STC_LOCAL_CPPFLAGS = -I$(top_srcdir)/static -I$(top_builddir)/static MLC_LOCAL_CPPFLAGS = -I$(top_srcdir)/metalic -I$(top_builddir)/metalic CPPFLAGS = \ + -I$(srcdir)/.. \ $(OLN_LOCAL_CPPFLAGS) $(XTD_LOCAL_CPPFLAGS) \ $(STC_LOCAL_CPPFLAGS) $(MLC_LOCAL_CPPFLAGS) Index: tests/io/Makefile.am --- tests/io/Makefile.am (revision 0) +++ tests/io/Makefile.am (revision 0) @@ -0,0 +1,28 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Revamp (see Olena 0.10's test suite). + +AM_CPPFLAGS = \ + -I$(srcdir)/.. -I$(srcdir)/../check \ + -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ + -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ + -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution. +# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will +# warn against this, but that's OK). +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +CXXFLAGS += $(TESTS_CXXFLAGS) + +check_PROGRAMS = \ + io_pnm + +# I/O. +io_pnm_SOURCES = io_pnm.cc + + +TESTS = $(check_PROGRAMS) Index: tests/Makefile.am --- tests/Makefile.am (revision 653) +++ tests/Makefile.am (working copy) @@ -1,78 +1,7 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = check sanity +## FIXME: Revamp (see Olena 0.10's test suite). -# FIXME: Revamp (see Olena 0.10's test suite). - -AM_CPPFLAGS = \ - -I$(srcdir)/check \ - -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ - -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ - -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" - -# FIXME: Add -# -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) -# -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). -TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +SUBDIRS = check sanity core value io morphers algorithms noinst_HEADERS = data.hh - -check_PROGRAMS = \ - dpoint2d \ - point2d \ - grid \ - image_entry \ - image1d \ - image2d \ - image3d \ - npoints \ - window2d \ - \ - at \ - \ - grey \ - io_pnm \ - \ - identity_morpher \ - add_neighborhood_morpher \ - value_cast \ - morphers \ - \ - fill - -# Images and auxiliary structures. -dpoint2d_SOURCES = dpoint2d.cc -point2d_SOURCES = point2d.cc -grid_SOURCES = grid.cc -image_entry_SOURCES = image_entry.cc -image1d_SOURCES = image1d.cc -image2d_SOURCES = image2d.cc -image3d_SOURCES = image3d.cc -npoints_SOURCES = npoints.cc -window2d_SOURCES = window2d.cc - -# Methods. -at_SOURCES = at.cc - -# I/O. -io_pnm_SOURCES = io_pnm.cc - -# Value. -grey_SOURCES = grey.cc - -# Morphers. -identity_morpher_SOURCES = identity_morpher.cc -add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc -value_cast_SOURCES = value_cast.cc -morphers_SOURCES = morphers.cc - -# Algorithms. -fill_SOURCES = fill.cc - - -TESTS = $(check_PROGRAMS) Index: tests/algorithms/Makefile.am --- tests/algorithms/Makefile.am (revision 0) +++ tests/algorithms/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Don't forget to split olena/tests/algorithms to several +## directories when the stock of algorithms grows (olena/tests/level, +## olena/tests/morpho, etc.). + +## FIXME: Revamp (see Olena 0.10's test suite). + +AM_CPPFLAGS = \ + -I$(srcdir)/.. -I$(srcdir)/../check \ + -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ + -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ + -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution. +# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will +# warn against this, but that's OK). +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +CXXFLAGS += $(TESTS_CXXFLAGS) + +check_PROGRAMS = \ + fill + +# Algorithms. +fill_SOURCES = fill.cc + + +TESTS = $(check_PROGRAMS) Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 0) +++ tests/value/Makefile.am (revision 0) @@ -0,0 +1,28 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Revamp (see Olena 0.10's test suite). + +AM_CPPFLAGS = \ + -I$(srcdir)/.. -I$(srcdir)/../check \ + -I$(top_srcdir)/olena -I$(top_srcdir)/extended \ + -I$(top_srcdir)/static -I$(top_srcdir)/metalic \ + -DOLN_IMG_DIR=\"$(top_srcdir)/olena/img\" + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution. +# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will +# warn against this, but that's OK). +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +CXXFLAGS += $(TESTS_CXXFLAGS) + +check_PROGRAMS = \ + grey + +# Value. +grey_SOURCES = grey.cc + + +TESTS = $(check_PROGRAMS) Index: oln/Makefile.am --- oln/Makefile.am (revision 653) +++ oln/Makefile.am (working copy) @@ -88,7 +88,7 @@ core/automatic/image/image1d.hh \ core/automatic/image/image2d.hh \ core/automatic/image/image3d.hh \ - core/automatic/image/image_being_mutable.hh \ + core/automatic/image/mutable_image.hh \ core/automatic/image/image_being_random_accessible.hh \ core/automatic/image/image_having_neighborhood.hh \ core/automatic/image/image_having_neighborhood.hh \