[Olena-patches] 1920: Reorganize the tests/ directory.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Reorganize the tests/ directory. * tests/algebra/, tests/test/: New directories. * tests/all.cc, * tests/border_resize_image1d_1.cc, * tests/border_resize_image1d_2.cc, * tests/border_resize_image1d_3.cc, * tests/border_resize_image2d_1.cc, * tests/border_resize_image2d_2.cc, * tests/border_resize_image2d_3.cc, * tests/border_resize_image3d_1.cc, * tests/border_resize_image3d_2.cc, * tests/border_resize_image3d_3.cc, * tests/border_resize_image_if.cc, * tests/border_resize_sub_image.cc, * tests/box1d.cc, * tests/box2d.cc, * tests/box3d.cc, * tests/cast_image.cc, * tests/clock_neighb2d.cc, * tests/clock_test.cc, * tests/convert_to_image.cc, * tests/convert_to_p_array.cc, * tests/convert_to_p_set.cc, * tests/convert_to_tiles.cc, * tests/convert_to_window.cc, * tests/core_p_set.cc, * tests/core_pset_if.cc, * tests/decorated_image.cc, * tests/dpoint1d.cc, * tests/dpoint2d.cc, * tests/dpoint3d.cc, * tests/estim_mean.cc, * tests/fi_adaptor.cc, * tests/hexa.cc, * tests/histo_to_image1d.cc, * tests/image1d.cc, * tests/image2d.cc, * tests/image2d_h.cc, * tests/image3d.cc, * tests/image_if.cc, * tests/image_if_interval.cc, * tests/image_if_value.cc, * tests/interpolated.cc, * tests/level_sort_points.cc, * tests/line_convolve.cc, * tests/line_piter.cc, * tests/linear_convolve.cc, * tests/linear_gaussian.cc, * tests/linear_lap.cc, * tests/linear_log.cc, * tests/local_convolve.cc, * tests/main.cc, * tests/mat.cc, * tests/metal_converts_to.cc, * tests/metal_is.cc, * tests/metal_mat.cc, * tests/metal_pow.cc, * tests/metal_unconst.cc, * tests/metal_vec.cc, * tests/pixel.cc, * tests/pixter1d.cc, * tests/pixter2d.cc, * tests/pixter3d.cc, * tests/plain.cc, * tests/point1d.cc, * tests/point2d.cc, * tests/point3d.cc, * tests/safe_image.cc, * tests/seed2tiling.cc, * tests/stack.cc, * tests/sub_image.cc, * tests/test_positive.cc, * tests/trait_ch_value.cc, * tests/trait_images.cc, * tests/trait_op_plus.cc, * tests/trait_op_uminus.cc, * tests/trait_super.cc, * tests/trait_value.cc, * tests/translate_image.cc, * tests/vec.cc, * tests/w_window1d_int.cc, * tests/w_window2d_int.cc, * tests/w_window3d_int.cc, * tests/window1d.cc, * tests/window2d.cc, * tests/window3d.cc: Move/rename as... * tests/all_headers.cc, * tests/border/resize_image1d_1.cc, * tests/border/resize_image1d_2.cc, * tests/border/resize_image1d_3.cc, * tests/border/resize_image2d_1.cc, * tests/border/resize_image2d_2.cc, * tests/border/resize_image2d_3.cc, * tests/border/resize_image3d_1.cc, * tests/border/resize_image3d_2.cc, * tests/border/resize_image3d_3.cc, * tests/border/resize_image_if.cc, * tests/border/resize_sub_image.cc, * tests/core/box1d.cc, * tests/core/box2d.cc, * tests/core/box3d.cc, * tests/core/cast_image.cc, * tests/core/clock_neighb2d.cc, * tests/core/clock_test.cc, * tests/convert/to_image.cc, * tests/convert/to_p_array.cc, * tests/convert/to_p_set.cc, * tests/convert/to_tiles.cc, * tests/convert/to_window.cc, * tests/core/p_set.cc, * tests/core/pset_if.cc, * tests/core/decorated_image.cc, * tests/core/dpoint1d.cc, * tests/core/dpoint2d.cc, * tests/core/dpoint3d.cc, * tests/estim/mean.cc, * tests/core/fi_adaptor.cc, * tests/core/hexa.cc, * tests/histo/to_image1d.cc, * tests/core/image1d.cc, * tests/core/image2d.cc, * tests/core/image2d_h.cc, * tests/core/image3d.cc, * tests/core/image_if.cc, * tests/core/image_if_interval.cc, * tests/core/image_if_value.cc, * tests/core/interpolated.cc, * tests/level/sort_points.cc, * tests/linear/line_convolve.cc, * tests/core/line_piter.cc, * tests/linear/convolve.cc, * tests/linear/gaussian.cc, * tests/linear/lap.cc, * tests/linear/log.cc, * tests/linear/local/convolve.cc, * tests/morpho/combined.cc, * tests/algebra/mat.cc, * tests/metal/converts_to.cc, * tests/metal/is.cc, * tests/algebra/mat2.cc, * tests/metal/math/pow.cc, * tests/metal/unconst.cc, * tests/algebra/vec.cc, * tests/core/pixel.cc, * tests/core/pixter1d_more.cc, * tests/core/pixter2d_more.cc, * tests/core/pixter3d_more.cc, * tests/core/plain.cc, * tests/core/point1d.cc, * tests/core/point2d.cc, * tests/core/point3d.cc, * tests/core/safe_image.cc, * tools/seed2tiling.cc, * tests/value/stack.cc, * tests/core/sub_image.cc, * tests/test/positive.cc, * tests/trait/ch_value.cc, * tests/trait/image/images.cc, * tests/trait/op/plus.cc, * tests/trait/op/uminus.cc, * tests/trait/super.cc, * tests/trait/value/values.cc, * tests/core/translate_image.cc, * tests/algebra/vec2.cc, * tests/core/w_window1d_int.cc, * tests/core/w_window2d_int.cc, * tests/core/w_window3d_int.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/window3d.cc: ...these. * tests/Makefile.am, * tests/border/Makefile.am, * tests/canvas/Makefile.am, * tests/convert/Makefile.am, * tests/core/Makefile.am, * tests/estim/Makefile.am, * tests/histo/Makefile.am, * tests/level/Makefile.am, * tests/linear/Makefile.am, * tests/linear/local/Makefile.am, * tests/literal/Makefile.am, * tests/metal/Makefile.am, * tests/metal/math/Makefile.am, * tests/morpho/Makefile.am, * tests/trait/Makefile.am, * tests/trait/image/Makefile.am, * tests/trait/op/Makefile.am, * tests/trait/value/Makefile.am, * tests/value/Makefile.am, * tools/Makefile.am: Adjust. * tests/algebra/Makefile.am, * tests/binarization/Makefile.am, * tests/subsampling/Makefile.am, * tests/test/Makefile.am: New. tests/Makefile.am | 204 +++-------------------------------------- tests/algebra/Makefile.am | 16 +++ tests/binarization/Makefile.am | 10 ++ tests/border/Makefile.am | 22 ++++ tests/canvas/Makefile.am | 2 tests/convert/Makefile.am | 15 +++ tests/core/Makefile.am | 118 +++++++++++++++++++++++ tests/estim/Makefile.am | 7 + tests/histo/Makefile.am | 4 tests/level/Makefile.am | 6 - tests/linear/Makefile.am | 12 ++ tests/linear/local/Makefile.am | 7 + tests/literal/Makefile.am | 15 +++ tests/metal/Makefile.am | 13 ++ tests/metal/math/Makefile.am | 7 + tests/morpho/Makefile.am | 3 tests/morpho/combined.cc | 11 -- tests/subsampling/Makefile.am | 10 ++ tests/test/Makefile.am | 10 ++ tests/trait/Makefile.am | 11 ++ tests/trait/image/Makefile.am | 7 + tests/trait/op/Makefile.am | 9 + tests/trait/value/Makefile.am | 7 + tests/value/Makefile.am | 26 +++-- tools/Makefile.am | 7 + tools/seed2tiling.cc | 2 26 files changed, 350 insertions(+), 211 deletions(-) Index: tests/subsampling/Makefile.am --- tests/subsampling/Makefile.am (revision 0) +++ tests/subsampling/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + type + +type_SOURCES = type.cc + +TESTS = $(check_PROGRAMS) Index: tests/literal/Makefile.am --- tests/literal/Makefile.am (revision 1919) +++ tests/literal/Makefile.am (working copy) @@ -1,3 +1,18 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + black \ + medium_gray \ + one \ + white \ + zero + +black_SOURCES = black.cc +medium_gray_SOURCES = medium_gray.cc +one_SOURCES = one.cc +white_SOURCES = white.cc +zero_SOURCES = zero.cc + +TESTS = $(check_PROGRAMS) Index: tests/metal/math/Makefile.am --- tests/metal/math/Makefile.am (revision 1919) +++ tests/metal/math/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + pow + +pow_SOURCES = pow.cc + +TESTS = $(check_PROGRAMS) Index: tests/metal/Makefile.am --- tests/metal/Makefile.am (revision 1919) +++ tests/metal/Makefile.am (working copy) @@ -1,3 +1,16 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = make math + +check_PROGRAMS = \ + converts_to \ + is \ + unconst + +converts_to_SOURCES = converts_to.cc +is_SOURCES = is.cc +unconst_SOURCES = unconst.cc + +TESTS = $(check_PROGRAMS) Index: tests/level/Makefile.am --- tests/level/Makefile.am (revision 1919) +++ tests/level/Makefile.am (working copy) @@ -1,9 +1,9 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = approx naive - include $(top_srcdir)/milena/tests/tests.mk +SUBDIRS = approx naive + check_PROGRAMS = \ abs \ all_headers \ @@ -20,6 +20,7 @@ memset_ \ paste \ saturate \ + sort_points \ sort_psites \ sort_psites_full \ stretch \ @@ -41,6 +42,7 @@ memset__SOURCES = memset_.cc paste_SOURCES = paste.cc saturate_SOURCES = saturate.cc +sort_points_SOURCES = sort_points.cc sort_psites_SOURCES = sort_psites.cc stretch_SOURCES = stretch.cc take_SOURCES = take.cc Index: tests/linear/Makefile.am --- tests/linear/Makefile.am (revision 1919) +++ tests/linear/Makefile.am (working copy) @@ -2,9 +2,21 @@ include $(top_srcdir)/milena/tests/tests.mk +SUBDIRS = local + check_PROGRAMS = \ + convolve \ + gaussian \ + lap \ + line_convolve \ + log \ sobel +convolve_SOURCES = convolve.cc +gaussian_SOURCES = gaussian.cc +lap_SOURCES = lap.cc +line_convolve_SOURCES = line_convolve.cc +log_SOURCES = log.cc sobel_SOURCES = sobel.cc TESTS = $(check_PROGRAMS) Index: tests/linear/local/Makefile.am --- tests/linear/local/Makefile.am (revision 1919) +++ tests/linear/local/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + convolve + +convolve_SOURCES = convolve.cc + +TESTS = $(check_PROGRAMS) Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 1919) +++ tests/value/Makefile.am (working copy) @@ -7,47 +7,57 @@ ## ... SUBDIRS = \ - concept \ - builtin + builtin \ + concept check_PROGRAMS = \ bool \ equiv \ - float01_bis \ float01 \ + float01_bis \ float01_f \ graylevel \ - interop \ - int_s16 \ + graylevel_f \ int_s \ + int_s16 \ int_u8 \ + interop \ label \ + macros \ quat \ rgb8 \ scalar \ - set + set \ + stack # FIXME: Enable when make check_full works. # check_full_PROGRAMS = \ +# graylevel_full \ +# graylevel_f_full \ # rgb_full bool_SOURCES = bool.cc equiv_SOURCES = equiv.cc -float01_bis_SOURCES = float01_bis.cc float01_SOURCES = float01.cc +float01_bis_SOURCES = float01_bis.cc float01_f_SOURCES = float01_f.cc graylevel_SOURCES = graylevel.cc +graylevel_f_SOURCES = graylevel_f.cc interop_SOURCES = interop.cc -int_s16_SOURCES = int_s16.cc int_s_SOURCES = int_s.cc +int_s16_SOURCES = int_s16.cc int_u8_SOURCES = int_u8.cc label_SOURCES = label.cc +macros_SOURCES = macros.cc quat_SOURCES = quat.cc rgb8_SOURCES = rgb8.cc scalar_SOURCES = scalar.cc set_SOURCES = set.cc +stack_SOURCES = stack.cc # FIXME: Enable when make check_full works. +# graylevel_f_full_SOURCES = graylevel_f_full.cc +# graylevel_full_SOURCES = graylevel_full.cc # rgb_full_SOURCES = rgb_full.cc TESTS = $(check_PROGRAMS) Index: tests/border/Makefile.am --- tests/border/Makefile.am (revision 1919) +++ tests/border/Makefile.am (working copy) @@ -11,6 +11,17 @@ find \ get \ mirror \ + resize_image1d_1 \ + resize_image1d_2 \ + resize_image1d_3 \ + resize_image2d_1 \ + resize_image2d_2 \ + resize_image2d_3 \ + resize_image3d_1 \ + resize_image3d_2 \ + resize_image3d_3 \ + resize_image_if \ + resize_sub_image \ resize adjust_SOURCES = adjust.cc @@ -21,6 +32,17 @@ find_SOURCES = find.cc get_SOURCES = get.cc mirror_SOURCES = mirror.cc +resize_image1d_1_SOURCES = resize_image1d_1.cc +resize_image1d_2_SOURCES = resize_image1d_2.cc +resize_image1d_3_SOURCES = resize_image1d_3.cc +resize_image2d_1_SOURCES = resize_image2d_1.cc +resize_image2d_2_SOURCES = resize_image2d_2.cc +resize_image2d_3_SOURCES = resize_image2d_3.cc +resize_image3d_1_SOURCES = resize_image3d_1.cc +resize_image3d_2_SOURCES = resize_image3d_2.cc +resize_image3d_3_SOURCES = resize_image3d_3.cc +resize_image_if_SOURCES = resize_image_if.cc +resize_sub_image_SOURCES = resize_sub_image.cc resize_SOURCES = resize.cc TESTS = $(check_PROGRAMS) Index: tests/binarization/Makefile.am --- tests/binarization/Makefile.am (revision 0) +++ tests/binarization/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + thresholding + +thresholding_SOURCES = thresholding.cc + +TESTS = $(check_PROGRAMS) Index: tests/algebra/Makefile.am --- tests/algebra/Makefile.am (revision 0) +++ tests/algebra/Makefile.am (revision 0) @@ -0,0 +1,16 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + mat \ + mat2 \ + vec \ + vec2 + +mat_SOURCES = mat.cc +mat2_SOURCES = mat2.cc +vec_SOURCES = vec.cc +vec2_SOURCES = vec2.cc + +TESTS = $(check_PROGRAMS) Index: tests/canvas/Makefile.am --- tests/canvas/Makefile.am (revision 1919) +++ tests/canvas/Makefile.am (working copy) @@ -2,7 +2,7 @@ include $(top_srcdir)/milena/tests/tests.mk -SUBDIRS = browsing +SUBDIRS = browsing morpho check_PROGRAMS = \ chamfer Index: tests/trait/image/Makefile.am --- tests/trait/image/Makefile.am (revision 1919) +++ tests/trait/image/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + images + +images_SOURCES = images.cc + +TESTS = $(check_PROGRAMS) Index: tests/trait/Makefile.am --- tests/trait/Makefile.am (revision 1919) +++ tests/trait/Makefile.am (working copy) @@ -1,3 +1,14 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = image op value + +check_PROGRAMS = \ + ch_value \ + super + +ch_value_SOURCES = ch_value.cc +super_SOURCES = super.cc + +TESTS = $(check_PROGRAMS) Index: tests/trait/value/Makefile.am --- tests/trait/value/Makefile.am (revision 1919) +++ tests/trait/value/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + values + +values_SOURCES = values.cc + +TESTS = $(check_PROGRAMS) Index: tests/trait/op/Makefile.am --- tests/trait/op/Makefile.am (revision 1919) +++ tests/trait/op/Makefile.am (working copy) @@ -1,3 +1,12 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + plus \ + uminus + +plus_SOURCES = plus.cc +uminus_SOURCES = uminus.cc + +TESTS = $(check_PROGRAMS) Index: tests/histo/Makefile.am --- tests/histo/Makefile.am (revision 1919) +++ tests/histo/Makefile.am (working copy) @@ -3,8 +3,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - compute + compute \ + to_image1d compute_SOURCES = compute.cc +to_image1d_SOURCES = to_image1d.cc TESTS = $(check_PROGRAMS) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 1919) +++ tests/core/Makefile.am (working copy) @@ -3,70 +3,186 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + box1d \ + box2d \ + box3d \ + \ + cast_image \ category \ + clock_neighb2d \ + clock_test \ clone \ + \ + decorated_image \ + dpoint1d \ + dpoint2d \ + dpoint3d \ dpoints_pixter \ + \ exact \ + \ h_vec \ + hexa \ + \ + image1d \ + image2d \ + image2d_h \ + image3d \ + image_if \ + image_if_interval \ + image_if_value \ initialize \ + interpolated \ + \ graph_elt_neighborhood \ graph_elt_window \ graph_image \ + \ line_graph_elt_neighborhood \ line_graph_elt_window \ line_graph_image \ line_graph_image_wst \ + line_piter \ + \ mono_obased_rle_image \ mono_rle_image \ + \ neighb \ + \ obased_rle_image \ + \ p_priority_queue \ p_priority_queue_fast \ p_priority_queue_fast_with_array \ p_queue \ p_queue_fast \ p_runs \ + p_set \ + pixel \ pixter1d \ + pixter1d_more \ pixter2d \ + pixter2d_more \ pixter3d \ + pixter3d_more \ + plain \ + point1d \ + point2d \ + point3d \ point_set_compatibility \ pset_array \ + pset_if \ + \ rle_image \ + \ + safe_image \ sparse_image \ + sub_image \ + \ t_image \ - tr_image + tr_image \ + translate_image \ + \ + window1d \ + window2d \ + window3d \ + w_window1d_int \ + w_window2d_int \ + w_window3d_int +box1d_SOURCES = box1d.cc +box2d_SOURCES = box2d.cc +box3d_SOURCES = box3d.cc + +cast_image_SOURCES = cast_image.cc category_SOURCES = category.cc +clock_neighb2d_SOURCES = clock_neighb2d.cc +clock_test_SOURCES = clock_test.cc clone_SOURCES = clone.cc + +decorated_image_SOURCES = decorated_image.cc +dpoint1d_SOURCES = dpoint1d.cc +dpoint2d_SOURCES = dpoint2d.cc +dpoint3d_SOURCES = dpoint3d.cc dpoints_pixter_SOURCES = dpoints_pixter.cc + exact_SOURCES = exact.cc + h_vec_SOURCES = h_vec.cc +hexa_SOURCES = hexa.cc + +image1d_SOURCES = image1d.cc +image2d_SOURCES = image2d.cc +image2d_h_SOURCES = image2d_h.cc +image3d_SOURCES = image3d.cc +image_if_SOURCES = image_if.cc +image_if_interval_SOURCES = image_if_interval.cc +image_if_value_SOURCES = image_if_value.cc initialize_SOURCES = initialize.cc +interpolated_SOURCES = interpolated.cc + graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc graph_elt_window_SOURCES = graph_elt_window.cc graph_image_SOURCES = graph_image.cc + line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc line_graph_elt_window_SOURCES = line_graph_elt_window.cc line_graph_image_SOURCES = line_graph_image.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc +line_piter_SOURCES = line_piter.cc + mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc + neighb_SOURCES = neighb.cc + obased_rle_image_SOURCES = obased_rle_image.cc + p_priority_queue_SOURCES = p_priority_queue.cc p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc p_queue_SOURCES = p_priority_queue_fast.cc p_queue_fast_SOURCES = p_priority_queue_fast.cc p_runs_SOURCES = p_runs.cc +p_set_SOURCES = p_set.cc +pixel_SOURCES = pixel.cc pixter1d_SOURCES = pixter1d.cc +pixter1d_more_SOURCES = pixter1d_more.cc pixter2d_SOURCES = pixter2d.cc +pixter2d_more_SOURCES = pixter2d_more.cc pixter3d_SOURCES = pixter3d.cc +pixter3d_more_SOURCES = pixter3d_more.cc +plain_SOURCES = plain.cc +point1d_SOURCES = point1d.cc +point2d_SOURCES = point2d.cc +point3d_SOURCES = point3d.cc point_set_compatibility_SOURCES = point_set_compatibility.cc pset_array_SOURCES = pset_array.cc +pset_if_SOURCES = pset_if.cc + rle_image_SOURCES = rle_image.cc + +safe_image_SOURCES = safe_image.cc sparse_image_SOURCES = sparse_image.cc +sub_image_SOURCES = sub_image.cc + t_image_SOURCES = t_image.cc tr_image_SOURCES = tr_image.cc +translate_image_SOURCES = translate_image.cc + +window1d_SOURCES = window1d.cc +window2d_SOURCES = window2d.cc +window3d_SOURCES = window3d.cc +w_window1d_int_SOURCES = w_window1d_int.cc +w_window2d_int_SOURCES = w_window2d_int.cc +w_window3d_int_SOURCES = w_window3d_int.cc + +# Tests depending on the FreeImagePlus library. +if FREEIMAGEPLUS + check_PROGRAMS += fi_adaptor + fi_adaptor_SOURCES = fi_adaptor.cc + fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) + fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) +endif TESTS = $(check_PROGRAMS) Index: tests/test/Makefile.am --- tests/test/Makefile.am (revision 0) +++ tests/test/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + positive + +positive_SOURCES = positive.cc + +TESTS = $(check_PROGRAMS) Index: tests/convert/Makefile.am --- tests/convert/Makefile.am (revision 1919) +++ tests/convert/Makefile.am (working copy) @@ -1,3 +1,18 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + to_image \ + to_p_array \ + to_p_set \ + to_tiles \ + to_window + +to_image_SOURCES = to_image.cc +to_p_array_SOURCES = to_p_array.cc +to_p_set_SOURCES = to_p_set.cc +to_tiles_SOURCES = to_tiles.cc +to_window_SOURCES = to_window.cc + +TESTS = $(check_PROGRAMS) Index: tests/estim/Makefile.am --- tests/estim/Makefile.am (revision 1919) +++ tests/estim/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + mean + +mean_SOURCES = mean.cc + +TESTS = $(check_PROGRAMS) Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 1919) +++ tests/morpho/combined.cc (working copy) @@ -25,15 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -// FIXME: Rename (and possibly move) this file. - -/*! - * \file tests/main.cc - * - * \brief Test on mln::morpho. - * - * - */ +/// \file tests/morpho/combined.cc +/// \brief Test on several mln::morpho entities. #include <cmath> Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 1919) +++ tests/morpho/Makefile.am (working copy) @@ -4,6 +4,7 @@ check_PROGRAMS = \ closing_area \ + combined \ contrast \ dilation \ dilation_max_h \ @@ -40,6 +41,8 @@ meyer_wst_SOURCES = meyer_wst.cc +combined_SOURCES = combined.cc + # --------------- # # Complex tests. # # --------------- # Index: tests/Makefile.am --- tests/Makefile.am (revision 1919) +++ tests/Makefile.am (working copy) @@ -3,214 +3,46 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ - arith \ accu \ + algebra \ + arith \ + binarization \ border \ canvas \ + convert \ core \ - display \ debug \ + display \ draw \ + estim \ fun \ geom \ histo \ + io \ labeling \ level \ + linear \ + literal \ logical \ + math \ + metal \ morpho \ neighb \ norm \ pw \ set \ + subsampling \ + tag \ + test \ + trace \ + trait \ util \ value \ win check_PROGRAMS = \ - border_resize_image1d_1 \ - border_resize_image1d_2 \ - border_resize_image1d_3 \ - border_resize_image2d_1 \ - border_resize_image2d_2 \ - border_resize_image2d_3 \ - border_resize_image3d_1 \ - border_resize_image3d_2 \ - border_resize_image3d_3 \ - border_resize_image_if \ - border_resize_sub_image \ - box1d \ - box2d \ - box3d \ - \ - cast_image \ - convert_to_image \ - convert_to_tiles \ - convert_to_p_array \ - \ - decorated_image \ - dpoint1d \ - dpoint2d \ - dpoint3d \ - \ - estim_mean \ - \ - hexa \ - histo_to_image1d \ - \ - image1d \ - image2d \ - image2d_h \ - image3d \ - image_if \ - image_if_interval \ - image_if_value \ - interpolated \ - \ - level_sort_points \ - linear_convolve \ - linear_gaussian \ - linear_lap \ - linear_log \ - line_convolve \ - line_piter \ - local_convolve \ - \ - main \ - mat \ - metal_converts_to \ - metal_is \ - metal_mat \ - metal_pow \ - metal_unconst \ - metal_vec \ - \ - pixel \ - pixter1d \ - pixter2d \ - pixter3d \ - plain \ - point1d \ - point2d \ - point3d \ - \ - safe_image \ - seed2tiling \ - stack \ - sub_image \ - \ - test_positive \ - trait_ch_value \ - trait_images \ - trait_op_plus \ - trait_op_uminus \ - trait_super \ - trait_value \ - translate_image \ - \ - vec \ - \ - window1d \ - window2d \ - window3d \ - w_window1d_int \ - w_window2d_int \ - w_window3d_int - -border_resize_image1d_1_SOURCES = border_resize_image1d_1.cc -border_resize_image1d_2_SOURCES = border_resize_image1d_2.cc -border_resize_image1d_3_SOURCES = border_resize_image1d_3.cc -border_resize_image2d_1_SOURCES = border_resize_image2d_1.cc -border_resize_image2d_2_SOURCES = border_resize_image2d_2.cc -border_resize_image2d_3_SOURCES = border_resize_image2d_3.cc -border_resize_image3d_1_SOURCES = border_resize_image3d_1.cc -border_resize_image3d_2_SOURCES = border_resize_image3d_2.cc -border_resize_image3d_3_SOURCES = border_resize_image3d_3.cc -border_resize_image_if_SOURCES = border_resize_image_if.cc -border_resize_sub_image_SOURCES = border_resize_sub_image.cc -box1d_SOURCES = box1d.cc -box2d_SOURCES = box2d.cc -box3d_SOURCES = box3d.cc - -cast_image_SOURCES = cast_image.cc -convert_to_image_SOURCES = convert_to_image.cc -convert_to_tiles_SOURCES = convert_to_tiles.cc -convert_to_p_array_SOURCES = convert_to_p_array.cc - -decorated_image_SOURCES = decorated_image.cc -dpoint1d_SOURCES = dpoint1d.cc -dpoint2d_SOURCES = dpoint2d.cc -dpoint3d_SOURCES = dpoint3d.cc - -estim_mean_SOURCES = estim_mean.cc - -hexa_SOURCES = hexa.cc -histo_to_image1d_SOURCES = histo_to_image1d.cc - -image1d_SOURCES = image1d.cc -image2d_SOURCES = image2d.cc -image2d_h_SOURCES = image2d_h.cc -image3d_SOURCES = image3d.cc -image_if_SOURCES = image_if.cc -image_if_interval_SOURCES = image_if_interval.cc -image_if_value_SOURCES = image_if_value.cc -interpolated_SOURCES = interpolated.cc - -level_sort_points_SOURCES = level_sort_points.cc -linear_convolve_SOURCES = linear_convolve.cc -linear_gaussian_SOURCES = linear_gaussian.cc -linear_lap_SOURCES = linear_lap.cc -linear_log_SOURCES = linear_log.cc -line_convolve_SOURCES = line_convolve.cc -line_piter_SOURCES = line_piter.cc -local_convolve_SOURCES = local_convolve.cc - -main_SOURCES = main.cc -mat_SOURCES = mat.cc -metal_converts_to_SOURCES = metal_converts_to.cc -metal_is_SOURCES = metal_is.cc -metal_mat_SOURCES = metal_mat.cc -metal_pow_SOURCES = metal_pow.cc -metal_unconst_SOURCES = metal_unconst.cc -metal_vec_SOURCES = metal_vec.cc - -pixel_SOURCES = pixel.cc -pixter1d_SOURCES = pixter1d.cc -pixter2d_SOURCES = pixter2d.cc -pixter3d_SOURCES = pixter3d.cc -plain_SOURCES = plain.cc -point1d_SOURCES = point1d.cc -point2d_SOURCES = point2d.cc -point3d_SOURCES = point3d.cc - -safe_image_SOURCES = safe_image.cc -seed2tiling_SOURCES = seed2tiling.cc -stack_SOURCES = stack.cc -sub_image_SOURCES = sub_image.cc - -test_positive_SOURCES = test_positive.cc -trait_ch_value_SOURCES = trait_ch_value.cc -trait_images_SOURCES = trait_images.cc -trait_op_plus_SOURCES = trait_op_plus.cc -trait_op_uminus_SOURCES = trait_op_uminus.cc -trait_super_SOURCES = trait_super.cc -trait_value_SOURCES = trait_value.cc -translate_image_SOURCES = translate_image.cc - -vec_SOURCES = vec.cc - -window1d_SOURCES = window1d.cc -window2d_SOURCES = window2d.cc -window3d_SOURCES = window3d.cc -w_window1d_int_SOURCES = w_window1d_int.cc -w_window2d_int_SOURCES = w_window2d_int.cc -w_window3d_int_SOURCES = w_window3d_int.cc + all_headers -# Tests depending on the FreeImage library. -if FREEIMAGEPLUS - check_PROGRAMS += fi_adaptor - fi_adaptor_SOURCES = fi_adaptor.cc - fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) - fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) -endif +all_headers_SOURCES = all_headers.cc TESTS = $(check_PROGRAMS) Index: tools/Makefile.am --- tools/Makefile.am (revision 1919) +++ tools/Makefile.am (working copy) @@ -2,6 +2,11 @@ include $(top_srcdir)/milena/tools/tools.mk -bin_PROGRAMS = area_flooding +bin_PROGRAMS = \ + area_flooding \ + seed2tiling area_flooding_SOURCES = area_flooding.cc +seed2tiling_SOURCES = seed2tiling.cc + +# FIXME: Add some tests for these tools. Index: tools/seed2tiling.cc --- tools/seed2tiling.cc (revision 1919) +++ tools/seed2tiling.cc (working copy) @@ -57,8 +57,6 @@ int main(int argc, char* argv[]) { - // FIXME: A test should not be interactive. Maybe this program - // should be moved elsewehere. if (argc < 2) { std::cerr << "missing argument: "