Commit 324908fe authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Setup conditional unit-tests in Milena.

	* tests/unit_test/Makefile.am
	(regen-am): Update the use of build_unit_test.sh.
	(EXTRA_DIST): Add cond_tests_* files.

	* tests/unit_test/cond_tests_cfitsio,
	* tests/unit_test/cond_tests_gdcm,
	* tests/unit_test/cond_tests_magickxx,
	* tests/unit_test/cond_tests_tiff: New.

	* tests/unit_test/disabled_tests: Remove some conditional tests.

	* tests/unit_test/unit-tests.mk: Regen.
parent 5ee999b4
2010-08-10 Guillaume Lazzara <z@lrde.epita.fr>
Setup conditional unit-tests in Milena.
* tests/unit_test/Makefile.am
(regen-am): Update the use of build_unit_test.sh.
(EXTRA_DIST): Add cond_tests_* files.
* tests/unit_test/cond_tests_cfitsio,
* tests/unit_test/cond_tests_gdcm,
* tests/unit_test/cond_tests_magickxx,
* tests/unit_test/cond_tests_tiff: New.
* tests/unit_test/disabled_tests: Remove some conditional tests.
* tests/unit_test/unit-tests.mk: Regen.
2010-08-09 Guillaume Lazzara <z@lrde.epita.fr>
 
Small changes in Milena.
......@@ -17,7 +17,13 @@
include $(top_srcdir)/milena/tests/tests.mk
EXTRA_DIST = disabled_tests
COND_TESTS = cond_tests_cfitsio \
cond_tests_gdcm \
cond_tests_magickxx \
cond_tests_tiff
EXTRA_DIST = disabled_tests \
$(COND_TESTS)
# Regen files.
include $(top_srcdir)/build-aux/regen-recursive.mk
......@@ -26,7 +32,8 @@ regen-am:
&& ./build-aux/build_unit_test.sh \
milena/mln \
milena/tests/unit_test \
milena/tests/unit_test/disabled_tests
milena/tests/unit_test/disabled_tests \
mln
# FIXME: Change build_unit_test.sh so that the action looks like this:
#
......@@ -34,12 +41,13 @@ regen-am:
#
# `$(abs_top_srcdir)' is required because of the change of directory
# at the beginning og the action.
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS)
cd $(top_srcdir) \
&& ./build-aux/build_unit_test.sh \
milena/mln \
milena/tests/unit_test \
milena/tests/unit_test/disabled_tests
milena/tests/unit_test/disabled_tests \
mln
include $(srcdir)/unit-tests.mk
......
mln/io/fits/all.hh
mln/io/fits/load.hh
mln/io/dicom/all.hh
mln/io/dicom/load.hh
mln/io/dicom/get_header.hh
mln/io/magick/all.hh
mln/io/magick/load.hh
mln/io/magick/save.hh
mln/io/tiff/all.hh
mln/io/tiff/load.hh
......@@ -28,16 +28,6 @@ mln/debug/iota.spe.hh
mln/debug/println.spe.hh
mln/debug/println_with_border.spe.hh
mln/histo/compute.spe.hh
mln/io/dicom/all.hh
mln/io/dicom/load.hh
mln/io/fits/all.hh
mln/io/fits/load.hh
mln/io/magick/all.hh
mln/io/magick/load.hh
mln/io/magick/save.hh
mln/io/tiff/all.hh
mln/io/tiff/load.hh
mln/io/tiff/save.hh
mln/labeling/value.spe.hh
mln/logical/not.spe.hh
mln/morpho/general.spe.hh
## Generated by ./build-aux/build_unit_test.sh, do not modify.
check_PROGRAMS = \
mln_+trash_erosion_tolerant \
check_PROGRAMS =
# Starting a conditional unit test list.
if HAVE_CFITSIO
check_PROGRAMS += \
mln_io_fits_all \
mln_io_fits_load
mln_io_fits_all_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_fits_all_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS}
mln_io_fits_all_SOURCES = mln_io_fits_all.cc
mln_io_fits_load_CPPFLAGS= ${CFITSIO_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS}
mln_io_fits_load_SOURCES = mln_io_fits_load.cc
endif HAVE_CFITSIO
# Starting a conditional unit test list.
if HAVE_GDCM
check_PROGRAMS += \
mln_io_dicom_all \
mln_io_dicom_load \
mln_io_dicom_get_header
mln_io_dicom_all_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_dicom_all_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS}
mln_io_dicom_all_SOURCES = mln_io_dicom_all.cc
mln_io_dicom_load_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_dicom_load_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS}
mln_io_dicom_load_SOURCES = mln_io_dicom_load.cc
mln_io_dicom_get_header_CPPFLAGS= ${GDCM_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_dicom_get_header_LDFLAGS= ${GDCM_LDFLAGS} ${AM_LDFLAGS}
mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc
endif HAVE_GDCM
# Starting a conditional unit test list.
if HAVE_MAGICKXX
check_PROGRAMS += \
mln_io_magick_all \
mln_io_magick_load \
mln_io_magick_save
mln_io_magick_all_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_magick_all_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS}
mln_io_magick_all_SOURCES = mln_io_magick_all.cc
mln_io_magick_load_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_magick_load_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS}
mln_io_magick_load_SOURCES = mln_io_magick_load.cc
mln_io_magick_save_CPPFLAGS= ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_magick_save_LDFLAGS= ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS}
mln_io_magick_save_SOURCES = mln_io_magick_save.cc
endif HAVE_MAGICKXX
# Starting a conditional unit test list.
if HAVE_TIFF
check_PROGRAMS += \
mln_io_tiff_all \
mln_io_tiff_load
mln_io_tiff_all_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_tiff_all_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS}
mln_io_tiff_all_SOURCES = mln_io_tiff_all.cc
mln_io_tiff_load_CPPFLAGS= ${TIFF_CPPFLAGS} ${AM_CPPFLAGS}
mln_io_tiff_load_LDFLAGS= ${TIFF_LDFLAGS} ${AM_LDFLAGS}
mln_io_tiff_load_SOURCES = mln_io_tiff_load.cc
endif HAVE_TIFF
# Starting non-conditional unit test list.
check_PROGRAMS += \
mln_accu_all \
mln_accu_center \
mln_accu_compute \
......@@ -671,7 +737,6 @@ mln_io_all \
mln_io_cloud_all \
mln_io_cloud_load \
mln_io_cloud_save \
mln_io_dicom_get_header \
mln_io_dump_all \
mln_io_dump_get_header \
mln_io_dump_load \
......@@ -1308,7 +1373,6 @@ mln_world_all \
mln_world_binary_2d_all \
mln_world_binary_2d_enlarge \
mln_world_binary_2d_projected_histo \
mln_world_binary_2d_reduce \
mln_world_binary_2d_subsample \
mln_world_inter_pixel_all \
mln_world_inter_pixel_compute \
......@@ -1326,7 +1390,6 @@ mln_world_inter_pixel_is_separator \
mln_world_inter_pixel_neighb2d \
mln_world_inter_pixel_separator_to_pixels
mln_+trash_erosion_tolerant_SOURCES = mln_+trash_erosion_tolerant.cc
mln_accu_all_SOURCES = mln_accu_all.cc
mln_accu_center_SOURCES = mln_accu_center.cc
mln_accu_compute_SOURCES = mln_accu_compute.cc
......@@ -1996,7 +2059,6 @@ mln_io_all_SOURCES = mln_io_all.cc
mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc
mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc
mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc
mln_io_dicom_get_header_SOURCES = mln_io_dicom_get_header.cc
mln_io_dump_all_SOURCES = mln_io_dump_all.cc
mln_io_dump_get_header_SOURCES = mln_io_dump_get_header.cc
mln_io_dump_load_SOURCES = mln_io_dump_load.cc
......@@ -2633,7 +2695,6 @@ mln_world_all_SOURCES = mln_world_all.cc
mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc
mln_world_binary_2d_enlarge_SOURCES = mln_world_binary_2d_enlarge.cc
mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc
mln_world_binary_2d_reduce_SOURCES = mln_world_binary_2d_reduce.cc
mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc
mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc
mln_world_inter_pixel_compute_SOURCES = mln_world_inter_pixel_compute.cc
......@@ -2650,3 +2711,4 @@ mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc
mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc
mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc
mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment