[Olena-patches] olena: olena-2.0-638-g773114f Run FFT unit tests only when FFTW3 support is enabled.

* tests/unit_test/cond_tests_fftw3: New. * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 8 ++++++++ milena/tests/unit_test/Makefile.am | 3 ++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 72bfb1a..f7fb36d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-08-26 Roland Levillain <roland(a)lrde.epita.fr> + + Run FFT unit tests only when FFTW3 support is enabled. + + * tests/unit_test/cond_tests_fftw3: New. + * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. + * tests/unit_test/unit-tests.mk: Regen. + 2012-10-10 Roland Levillain <roland(a)lrde.epita.fr> Split the interface of the FFT off from its implementation. diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 37df4c8..1c3016f 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -19,6 +19,7 @@ include $(top_srcdir)/milena/tests/tests.mk COND_TESTS = cond_tests_boost-tuple \ cond_tests_cfitsio \ + cond_tests_fftw3 \ cond_tests_gdcm \ cond_tests_magickxx \ cond_tests_poppler \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d1c1355..01272a0 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -24,6 +24,15 @@ mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} endif HAVE_CFITSIO # Starting a conditional unit test list. +if HAVE_FFTW3 +check_PROGRAMS += \ +mln_transform_fft + +mln_transform_fft_CPPFLAGS= ${FFTW3_CPPFLAGS} -DHAVE_FFTW3 ${AM_CPPFLAGS} +mln_transform_fft_LDFLAGS= ${FFTW3_LDFLAGS} ${AM_LDFLAGS} +endif HAVE_FFTW3 + +# Starting a conditional unit test list. if HAVE_GDCM check_PROGRAMS += \ mln_io_dicom_all \ @@ -1183,7 +1192,6 @@ mln_transform_distance_and_influence_zone_geodesic \ mln_transform_distance_front \ mln_transform_distance_geodesic \ mln_transform_essential \ -mln_transform_fft \ mln_transform_hough \ mln_transform_influence_zone_front \ mln_transform_influence_zone_geodesic \ -- 1.7.10.4