[Olena-patches] Minor changes on Olena testsuite

Index: ChangeLog from Damien Thivolle &lt;damien(a)lrde.epita.fr&gt; * tests/morpho/tests/dilation: Perform tests on small images. * tests/morpho/tests/erosion: Perform tests on small images. * tests/level/runs: Remove. * tests/io/tests/2d: Perform tests on small images. * tests/check/Makefile.flags: Remove optimization flags. * img/16x16.ppm: New. * img/16x16.pbm.gz: New. * img/16x16.pgm.gz: New. * img/16x16.ppm.gz: New. * img/16x16.pbm: New. * img/16x16.pgm: New. img/16x16.pgm | 5 +++++ img/16x16.ppm | 5 +++++ tests/check/Makefile.flags | 2 +- tests/io/tests/2d | 12 ++++++------ tests/morpho/tests/dilation | 3 ++- tests/morpho/tests/erosion | 4 +++- 6 files changed, 22 insertions(+), 9 deletions(-) Index: tests/morpho/tests/dilation --- tests/morpho/tests/dilation (revision 142) +++ tests/morpho/tests/dilation (working copy) @@ -17,8 +17,9 @@ typedef oln::image2d<ntg::bin> im_type; im_type ima; - ima = oln::io::read(rdata("object.pbm")); + ima = oln::io::read(rdata("16x16.pbm")); + std::cout << oln::utils::md5(oln::morpho::dilation(ima, oln::win_c8p())) << std::endl; if (oln::utils::md5(oln::morpho::dilation(ima, oln::win_c8p())) == key) { std::cout << "OK" << std::endl; Index: tests/morpho/tests/erosion --- tests/morpho/tests/erosion (revision 142) +++ tests/morpho/tests/erosion (working copy) @@ -17,7 +17,9 @@ typedef oln::image2d<ntg::bin> im_type; im_type ima; - ima = oln::io::read(rdata("object.pbm")); + ima = oln::io::read(rdata("16x16.pbm")); + + std::cout << oln::utils::md5(oln::morpho::dilation(ima, oln::win_c8p())) << std::endl; if (oln::utils::md5(oln::morpho::erosion(ima, oln::win_c8p())) == key) { std::cout << "OK" << std::endl; Index: tests/io/tests/2d --- tests/io/tests/2d (revision 142) +++ tests/io/tests/2d (working copy) @@ -38,14 +38,14 @@ typedef oln::image2d<ntg::rgb_8> ima_rgb_8; typedef oln::image2d<ntg::bin> ima_bin; - fail |= loadsave< ima_int_u8 >(rdata("lena.pgm"), "lena.pgm"); - fail |= loadsave< ima_bin >(rdata("lena.pbm"), "lena.pbm"); - fail |= loadsave< ima_rgb_8 >(rdata("lena.ppm"), "lena.ppm"); + fail |= loadsave< ima_int_u8 >(rdata("16x16.pgm"), "16x16.pgm"); + fail |= loadsave< ima_bin >(rdata("16x16.pbm"), "16x16.pbm"); + fail |= loadsave< ima_rgb_8 >(rdata("16x16.ppm"), "16x16.ppm"); #if HAVE_ZLIB - fail |= loadsave< ima_bin >(rdata("lena.pbm.gz"), "lena.pbm.gz"); - fail |= loadsave< ima_int_u8 >(rdata("lena.pgm.gz"), "lena.pgm.gz"); - fail |= loadsave< ima_rgb_8 >(rdata("lena.ppm.gz"), "lena.ppm.gz"); + fail |= loadsave< ima_bin >(rdata("16x16.pbm.gz"), "16x16.pbm.gz"); + fail |= loadsave< ima_int_u8 >(rdata("16x16.pgm.gz"), "16x16.pgm.gz"); + fail |= loadsave< ima_rgb_8 >(rdata("16x16.ppm.gz"), "16x16.ppm.gz"); #endif return fail; Index: tests/check/Makefile.flags --- tests/check/Makefile.flags (revision 142) +++ tests/check/Makefile.flags (working copy) @@ -1,7 +1,7 @@ # -*- Makefile -*- AM_CXXFLAGS = \ - $(CXXFLAGS_DEBUG) $(CXXFLAGS_OPTIMIZE) \ + $(CXXFLAGS_DEBUG) \ $(CXXFLAGS_STRICT_ERRORS) $(ZLIB_CXXFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir)/metalic/tests/check \ Index: img/16x16.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.ppm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/16x16.pgm.gz Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.pgm.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/16x16.ppm.gz Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.ppm.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/16x16.pbm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.pbm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/16x16.pgm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/16x16.pbm.gz Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/16x16.pbm.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream -- Damien Thivolle damien(a)lrde.epita.fr