* tests/labeling/fill_holes.cc: do not save output. * tests/Makefile.am, * tests/binarization/Makefile.am, * tests/data/Makefile.am, * tests/data/approx/Makefile.am, * tests/data/naive/Makefile.am, * tests/geom/Makefile.am, * tests/io/dump/Makefile.am, * tests/io/fits/Makefile.am, * tests/io/magick/Makefile.am, * tests/io/off/Makefile.am, * tests/io/pbm/Makefile.am, * tests/io/pbms/Makefile.am, * tests/io/pgm/Makefile.am, * tests/io/pgms/Makefile.am, * tests/io/ppm/Makefile.am, * tests/io/ppms/Makefile.am, * tests/linear/Makefile.am, * tests/morpho/Makefile.am, * tests/morpho/approx/Makefile.am, * tests/morpho/closing/Makefile.am, * tests/morpho/opening/Makefile.am, * tests/morpho/watershed/Makefile.am: add generated files to CLEANFILES. --- milena/ChangeLog | 30 +++++++++++++++++++++++++++++ milena/tests/Makefile.am | 1 - milena/tests/binarization/Makefile.am | 7 ++++++ milena/tests/data/Makefile.am | 8 +++++++ milena/tests/data/approx/Makefile.am | 7 ++++++ milena/tests/data/naive/Makefile.am | 6 +++++ milena/tests/geom/Makefile.am | 2 + milena/tests/io/dump/Makefile.am | 5 ++++ milena/tests/io/fits/Makefile.am | 8 +++++++ milena/tests/io/magick/Makefile.am | 8 +++++++ milena/tests/io/off/Makefile.am | 6 +++++ milena/tests/io/pbm/Makefile.am | 5 ++++ milena/tests/io/pbms/Makefile.am | 4 +++ milena/tests/io/pgm/Makefile.am | 10 +++++++++ milena/tests/io/pgms/Makefile.am | 5 ++++ milena/tests/io/ppm/Makefile.am | 10 +++++++++ milena/tests/io/ppms/Makefile.am | 5 ++++ milena/tests/labeling/fill_holes.cc | 10 +++++--- milena/tests/linear/Makefile.am | 5 ++++ milena/tests/morpho/Makefile.am | 10 +++++++++ milena/tests/morpho/approx/Makefile.am | 8 +++++++ milena/tests/morpho/closing/Makefile.am | 9 ++++++++ milena/tests/morpho/opening/Makefile.am | 8 +++++++ milena/tests/morpho/watershed/Makefile.am | 8 +++++++ 24 files changed, 180 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dee69b2..8cec4fb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2009-06-29 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Cleanup test output files during distclean. + + * tests/labeling/fill_holes.cc: do not save output. + + * tests/Makefile.am, + * tests/binarization/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/geom/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/Makefile.am, + * tests/io/magick/Makefile.am, + * tests/io/off/Makefile.am, + * tests/io/pbm/Makefile.am, + * tests/io/pbms/Makefile.am, + * tests/io/pgm/Makefile.am, + * tests/io/pgms/Makefile.am, + * tests/io/ppm/Makefile.am, + * tests/io/ppms/Makefile.am, + * tests/linear/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/watershed/Makefile.am: add generated files to + CLEANFILES. + +2009-06-29 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + * nodist-headers: Remove mln/fun/binary.hh from distribution. 2009-06-29 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index b8a0752..b4acaa9 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -57,7 +57,6 @@ SUBDIRS = \ trace \ trait \ transform \ - transformation \ unit_test \ util \ value \ diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index ea282d8..3a258fd 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/Makefile.am @@ -25,3 +25,10 @@ check_PROGRAMS = \ threshold_SOURCES = threshold.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ +out1.pgm \ +out2.pgm diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index a87c109..213cdbe 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -68,3 +68,11 @@ update_SOURCES = update.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out_line.pgm \ + out.pgm \ + out_rect.pgm diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am index 8e7a187..0c33433 100644 --- a/milena/tests/data/approx/Makefile.am +++ b/milena/tests/data/approx/Makefile.am @@ -35,3 +35,10 @@ median_SOURCES = median.cc median_CXXFLAGS = $(LONG_TESTS_CXXFLAGS) TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out_oct.pgm \ + out_rec.pgm diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am index 7ee5f9e..7a9da64 100644 --- a/milena/tests/data/naive/Makefile.am +++ b/milena/tests/data/naive/Makefile.am @@ -35,3 +35,9 @@ median_SOURCES = median.cc median_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.pgm diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index fae2c31..9149ca2 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -35,6 +35,7 @@ nrows \ nsites \ nslis \ pmin_pmax \ +rotate \ seed2tiling \ seed2tiling_roundness @@ -54,6 +55,7 @@ nrows_SOURCES = nrows.cc nsites_SOURCES = nsites.cc nslis_SOURCES = nslis.cc pmin_pmax_SOURCES = pmin_pmax.cc +rotate_SOURCES = rotate.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index d9d63f2..cad3d5b 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -25,3 +25,8 @@ check_PROGRAMS = \ dump_SOURCES = dump.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = pic.dump \ No newline at end of file diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index cd5e89e..77770ce 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -27,3 +27,11 @@ check_PROGRAMS = fits fits_SOURCES = fits.cc TESTS = $(check_PROGRAMS) + + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.pfm \ + out2.pfm diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 304ac10..0e1d9db 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -30,3 +30,11 @@ load_SOURCES = load.cc save_SOURCES = save.cc TESTS = $(check_PROGRAMS) + + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + tiny.ppm \ + tiny.png diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index 027f063..2ed2594 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -31,3 +31,9 @@ load_save_bin_SOURCES = load_save_bin.cc load_float_SOURCES = load_float.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.off diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index 068e5bd..351207d 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -27,3 +27,8 @@ pbm_SOURCES = pbm.cc pbm_ascii_SOURCES = pbm_ascii.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = out.pbm \ No newline at end of file diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am index 1486112..1a3fc5c 100644 --- a/milena/tests/io/pbms/Makefile.am +++ b/milena/tests/io/pbms/Makefile.am @@ -25,3 +25,7 @@ check_PROGRAMS = \ load_SOURCES = load.cc TESTS = $(check_PROGRAMS) + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = out.pbm \ No newline at end of file diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index 80eb607..f6eef7c 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -33,3 +33,13 @@ pgm_ascii_SOURCES = pgm_ascii.cc pgm_SOURCES = pgm.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out8.pgm \ + out27.pgm \ + out19.pgm \ + out16.pgm \ + out.pgm diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am index 1486112..8a4f02a 100644 --- a/milena/tests/io/pgms/Makefile.am +++ b/milena/tests/io/pgms/Makefile.am @@ -25,3 +25,8 @@ check_PROGRAMS = \ load_SOURCES = load.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = out.pgm \ No newline at end of file diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 7da43b8..913dd04 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -29,3 +29,13 @@ ppm23_SOURCES = ppm23.cc ppm_SOURCES = ppm.cc TESTS = $(check_PROGRAMS) + + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.ppm \ + out16.ppm \ + out23.ppm \ + out8.ppm diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am index 1486112..173a9f7 100644 --- a/milena/tests/io/ppms/Makefile.am +++ b/milena/tests/io/ppms/Makefile.am @@ -25,3 +25,8 @@ check_PROGRAMS = \ load_SOURCES = load.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = out.ppm \ No newline at end of file diff --git a/milena/tests/labeling/fill_holes.cc b/milena/tests/labeling/fill_holes.cc index 5f85246..bbf55b8 100644 --- a/milena/tests/labeling/fill_holes.cc +++ b/milena/tests/labeling/fill_holes.cc @@ -23,6 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// Test of labeling::fill_holes. +/// +/// \fixme Write a Test! + #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> #include <mln/core/alias/neighb2d.hh> @@ -40,10 +46,6 @@ int main() using namespace mln; image2d<bool> pic = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); - debug::println(pic); value::label_8 n; image2d<bool> out = labeling::fill_holes(pic, c4(), n); - debug::println(out); - io::pbm::save(out, "out.pbm"); -// mln_assertion(n == 33); } diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 67d21fc..3bc1b01 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -50,3 +50,8 @@ gaussian__SOURCES = gaussian.cc #>> TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = out.pgm \ No newline at end of file diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index edd0f60..4a7c649 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -105,3 +105,13 @@ meyer_wst_long_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) TESTS = $(check_PROGRAMS) +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.ppm \ + out.pbm \ + out3.pgm \ + wst.neato \ + out1.pgm \ + out2.pgm \ + out.pgm diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index 02deae8..85fc367 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/approx/Makefile.am @@ -27,3 +27,11 @@ dilation_SOURCES = dilation.cc erosion_SOURCES = erosion.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.pbm \ + ref.pbm + diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index 7e6d60f..c75b590 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -42,3 +42,12 @@ structural_SOURCES = structural.cc sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + ref.pgm \ + out.pbm \ + ref.pbm \ + out.pgm diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index 3c150ff..2b3425c 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -42,3 +42,11 @@ structural_SOURCES = structural.cc sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + approx/out.pbm \ + approx/ref.pbm \ + out.pgm diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index db715fb..be39ac7 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/Makefile.am @@ -27,3 +27,11 @@ flooding_SOURCES = flooding.cc superpose_SOURCES = superpose.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + tmp_ref.pgm \ + tmp_out.pgm + -- 1.5.6.5