* tests/convert/Makefile.am, * tests/extract/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/linear/Makefile.am, * tests/linear/gaussian/Makefile.am, * tests/registration/Makefile.am: Here. * tests/value/Makefile.am: Likewise. (full-check): Remove target. Aesthetic changes. --- milena/ChangeLog | 15 +++++++++++++++ milena/tests/convert/Makefile.am | 11 ++++++++--- milena/tests/extract/Makefile.am | 13 ++++++++----- milena/tests/fun/v2v/Makefile.am | 20 ++++++++++++++------ milena/tests/linear/Makefile.am | 9 +++++---- milena/tests/linear/gaussian/Makefile.am | 3 +++ milena/tests/registration/Makefile.am | 9 +++++---- milena/tests/value/Makefile.am | 30 ++++++++++++++---------------- 8 files changed, 72 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 016599c..8c22c9a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -36,6 +36,21 @@ 2009-06-12 Roland Levillain <roland@lrde.epita.fr> + Tag some some tests as ``not distributed''. + + * tests/convert/Makefile.am, + * tests/extract/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/registration/Makefile.am: + Here. + * tests/value/Makefile.am: Likewise. + (full-check): Remove target. + Aesthetic changes. + +2009-06-12 Roland Levillain <roland@lrde.epita.fr> + Update the list of non distributed headers. * nodist-headers: Here. diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index 5ada92b..ab369d9 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -21,7 +22,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = impl -##FIXME: re-enable all tests check_PROGRAMS = \ to_image \ to_p_array \ @@ -29,11 +29,16 @@ check_PROGRAMS = \ to_rgb \ to_window -# to_hsl_SOURCES = to_hsl.cc De-activated for 1.0 to_image_SOURCES = to_image.cc to_p_array_SOURCES = to_p_array.cc to_p_set_SOURCES = to_p_set.cc to_rgb_SOURCES = to_rgb.cc to_window_SOURCES = to_window.cc +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += to_hsl +to_hsl_SOURCES = to_hsl.cc +#>> + TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index 54d2768..f7b0c1c 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -19,12 +19,14 @@ include $(top_srcdir)/milena/tests/tests.mk +#<<lrde +# FIXME: Not distributed (yet). check_PROGRAMS = \ - blue \ - green \ - hue \ - lum \ - red \ + blue \ + green \ + hue \ + lum \ + red \ sat blue_SOURCES = blue.cc @@ -33,5 +35,6 @@ hue_SOURCES = hue.cc lum_SOURCES = lum.cc red_SOURCES = red.cc sat_SOURCES = sat.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index fbe268c..872c7a5 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -21,16 +21,24 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - norm \ - projection \ - wrap + norm \ + projection \ + wrap norm_SOURCES = norm.cc projection_SOURCES = projection.cc wrap_SOURCES = wrap.cc -# rgb_to_hsl_SOURCES = rgb_to_hsl.cc De-activated for 1.0 -# hsl_to_rgb_SOURCES = hsl_to_rgb.cc De-activated for 1.0 -# component_SOURCES = component.cc De-activated for 1.0 +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += \ + component \ + hsl_to_rgb \ + rgb_to_hsl + +component_SOURCES = component.cc +hsl_to_rgb_SOURCES = hsl_to_rgb.cc +rgb_to_hsl_SOURCES = rgb_to_hsl.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index a8e2c08..070415f 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -23,8 +23,6 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ local -# gaussian De-activated for 1.0 - check_PROGRAMS = \ convolve \ convolve_directional \ @@ -40,7 +38,10 @@ convolve_2x1d_SOURCES = convolve_2x1d.cc log_SOURCES = log.cc sobel_2d_SOURCES = sobel_2d.cc -# gaussian__SOURCES = gaussian.cc De-activated for 1.0 - +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += gaussian_ +gaussian__SOURCES = gaussian.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index 176971f..a3000c3 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -19,9 +19,12 @@ include $(top_srcdir)/milena/tests/tests.mk +#<<lrde +# FIXME: Not distributed (yet). check_PROGRAMS = \ filter filter_SOURCES = filter.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 4aa4314..f2a953c 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -19,9 +19,10 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = -# registration - -#registration_SOURCES = registration.cc +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS = registration +registration_SOURCES = registration.cc +#>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 59c3314..8650dd3 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -19,15 +20,11 @@ include $(top_srcdir)/milena/tests/tests.mk -## FIXME: To be added to milena/tests/tests.mk. -full-check: check -## ... - SUBDIRS = \ builtin \ concept -#FIXME: re-enable all the tests. +# FIXME: Re-enable all the tests. check_PROGRAMS = \ bool \ equiv \ @@ -40,20 +37,12 @@ check_PROGRAMS = \ scalar \ set \ sign - -# stack De-activated for 1.0 # float01 # float01_bis # float01_f # graylevel # graylevel_f -# 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_SOURCES = float01.cc @@ -61,19 +50,28 @@ equiv_SOURCES = equiv.cc #float01_f_SOURCES = float01_f.cc #graylevel_SOURCES = graylevel.cc #graylevel_f_SOURCES = graylevel_f.cc -interop_SOURCES = interop.cc int_s_SOURCES = int_s.cc int_s16_SOURCES = int_s16.cc int_u8_SOURCES = int_u8.cc +interop_SOURCES = interop.cc label_SOURCES = label.cc rgb8_SOURCES = rgb8.cc scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc -# stack_SOURCES = stack.cc De-activated for 1.0 +#<<lrde +# FIXME: Not distributed (yet). +check_PROGRAMS += stack +stack_SOURCES = stack.cc +#>> # FIXME: Enable when make check_full works. +# check_full_PROGRAMS = \ +# graylevel_full \ +# graylevel_f_full \ +# rgb_full +# # graylevel_f_full_SOURCES = graylevel_f_full.cc # graylevel_full_SOURCES = graylevel_full.cc # rgb_full_SOURCES = rgb_full.cc -- 1.6.2.4