* tests/unit_test/build_unit_test.sh (HEADERS): Ignore files depending on optional packages (GDCM, CFITSIO, Magick++, TIFF). --- milena/ChangeLog | 7 +++++++ milena/tests/unit_test/build_unit_test.sh | 20 +++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 22ce781..081cf0b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland@lrde.epita.fr> + Do not exercise parts depening on optional dependencies. + + * tests/unit_test/build_unit_test.sh (HEADERS): Ignore files + depending on optional packages (GDCM, CFITSIO, Magick++, TIFF). + +2009-06-10 Roland Levillain <roland@lrde.epita.fr> + * mln/io/ppms/load.hh: Repair copyright header. 2009-06-10 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> diff --git a/milena/tests/unit_test/build_unit_test.sh b/milena/tests/unit_test/build_unit_test.sh index 55c4567..ae31679 100755 --- a/milena/tests/unit_test/build_unit_test.sh +++ b/milena/tests/unit_test/build_unit_test.sh @@ -32,7 +32,25 @@ test $# -eq 1 || { echo "Usage: $0 <mln path>" && exit 1; } ## FIXME: Ouch! Using `find' properly can probably save us some pipes, ## forks and characters here. -HEADERS=`find $1 -name "*.hh" | grep -vE "*.spe.hh" | grep -v "mln/core/concept/doc" | sort | sed -e 's/.*\/mln\/\(.*\)/mln\/\1/g' | sed 's/\.\.\/\.\.\///g'` +## +## FIXME: We do not include these directories +## +## mln/io/dicom +## mln/io/fits +## mln/io/magick +## mln/io/tiff +## +## because they contain files depending on optional (external) +## libraries. We should test them conditionally. +HEADERS=$(find $1 -name "*.hh" \ + | grep -vE "*.spe.hh" \ + | grep -v "mln/core/concept/doc" \ + | grep -v "mln/io/dicom" \ + | grep -v "mln/io/fits" \ + | grep -v "mln/io/magick" \ + | grep -v "mln/io/tiff" \ + | sort \ + | sed -e 's/.*\/mln\/\(.*\)/mln\/\1/g' | sed 's/\.\.\/\.\.\///g') output=unit-tests.mk -- 1.6.1.2