[Olena-patches] oln 10.162: Readd tests to swilena

En fait c'etait simplement ICC qui faisait des siennes. Conclusion, ICC il compile plus vite mais moins bien que g++. Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Correct the message that appears when doxygen is not enough up to date. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * configure.ac: Remove doxygen detection when ./configure is run with `--without-doc'. Index: tools/swilena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * swilena/python/tests/Makefile.am: Readd tests for swilena. * swilena/ruby/Makefile.am: Likewise. * swilena/ruby/tests/Makefile.am: Likewise. * swilena/python/Makefile.am: Likewise. * swilena/python/tests/morpho.py: Fix. * swilena/python/swilena_all1d.py: Adjust according to the split of swilena_morpho1d. * swilena/python/swilena_all2d.py: Likewise for swilena_morpho2d. * swilena/python/swilena_all3d.py: Likewise for swilena_morpho3d. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * tools/swilena/ruby/tests/Makefile.am: Add comments. * tools/swilena/python/tests/Makefile.am: Likewise. Index: config/oln.m4 --- config/oln.m4 Tue, 13 Apr 2004 19:49:30 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.4 600) +++ config/oln.m4 Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.5 600) @@ -354,7 +354,7 @@ ac_cv_doxygen_version=old fi]) if [ [ "$ac_cv_doxygen_version" = "old" ] ] ; then - AC_MSG_ERROR([Doxygen 1.3.4 or newer is required]) + AC_MSG_ERROR([Doxygen 1.3.4 or newer is required, run ./configure with --without-doc to disable the doc build]) fi ]) Index: tools/swilena/python/tests/Makefile.am --- tools/swilena/python/tests/Makefile.am Wed, 14 Apr 2004 17:41:51 +0200 thivol_d (oln/v/15_Makefile.a 1.3 600) +++ tools/swilena/python/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/15_Makefile.a 1.4 600) @@ -8,5 +8,5 @@ IMGDIR="$(top_srcdir)/olena/img" -## Remove comments when it works -## TESTS = arith.py conversions.py simple1.py morpho.py + +TESTS = arith.py conversions.py simple1.py morpho.py Index: tools/swilena/ruby/Makefile.am --- tools/swilena/ruby/Makefile.am Wed, 14 Apr 2004 17:16:51 +0200 thivol_d (oln/v/17_Makefile.a 1.5 600) +++ tools/swilena/ruby/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/17_Makefile.a 1.6 600) @@ -3,7 +3,7 @@ ## Makefile.am for swilena/python ## -SUBDIRS = . +SUBDIRS = . tests rubydir = $(libdir)/ruby Index: tools/swilena/ruby/tests/Makefile.am --- tools/swilena/ruby/tests/Makefile.am Wed, 14 Apr 2004 17:41:51 +0200 thivol_d (oln/v/18_Makefile.a 1.2 600) +++ tools/swilena/ruby/tests/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/18_Makefile.a 1.3 600) @@ -8,5 +8,4 @@ IMGDIR="$(top_srcdir)/olena/img" -## Remove comments when it works. -## TESTS = simple1.rb +TESTS = simple1.rb Index: tools/swilena/python/tests/morpho.py --- tools/swilena/python/tests/morpho.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/47_morpho.py 1.1 700) +++ tools/swilena/python/tests/morpho.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/v/47_morpho.py 1.2 700) @@ -7,5 +7,6 @@ imgdir = os.environ['IMGDIR'] lena = image2d_u8(load(imgdir + "/lena.pgm")) -closing(lena, win_c4p()) +lenas32 = cast_to_int_s32(lena) +closing(lenas32, win_c4p()) #watershed_seg(lena, neighb_c4()) Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Wed, 14 Apr 2004 17:16:51 +0200 thivol_d (oln/w/2_Makefile.a 1.3 600) +++ tools/swilena/python/Makefile.am Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/2_Makefile.a 1.4 600) @@ -3,7 +3,7 @@ ## Makefile.am for swilena/python ## -SUBDIRS = . +SUBDIRS = . tests python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py Index: tools/swilena/python/swilena_all1d.py --- tools/swilena/python/swilena_all1d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/3_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all1d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/3_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image1d import * from swilena_imagesize1d import * from swilena_point1d import * -from swilena_morpho1d import * +from swilena_morpho1d_ntg_bin import * +from swilena_morpho1d_ntg_int_u32 import * +from swilena_morpho1d_ntg_int_u8 import * +from swilena_morpho1d_ntg_int_s32 import * +from swilena_morpho1d_ntg_int_u32 import * +from swilena_morpho1d_ntg_float import * from swilena_structelt1d import * from swilena_w_win1d import * from swilena_conversions1d import * Index: tools/swilena/python/swilena_all2d.py --- tools/swilena/python/swilena_all2d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/4_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all2d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/4_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image2d import * from swilena_imagesize2d import * from swilena_point2d import * -from swilena_morpho2d import * +from swilena_morpho2d_ntg_bin import * +from swilena_morpho2d_ntg_int_u8 import * +from swilena_morpho2d_ntg_int_u32 import * +from swilena_morpho2d_ntg_int_s8 import * +from swilena_morpho2d_ntg_int_s32 import * +from swilena_morpho2d_ntg_float import * from swilena_structelt2d import * from swilena_w_win2d import * from swilena_conversions2d import * Index: tools/swilena/python/swilena_all3d.py --- tools/swilena/python/swilena_all3d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/5_swilena_al 1.1 600) +++ tools/swilena/python/swilena_all3d.py Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/w/5_swilena_al 1.2 600) @@ -4,7 +4,12 @@ from swilena_image3d import * from swilena_imagesize3d import * from swilena_point3d import * -from swilena_morpho3d import * +from swilena_morpho3d_ntg_bin import * +from swilena_morpho3d_ntg_int_u32 import * +from swilena_morpho3d_ntg_int_u8 import * +from swilena_morpho3d_ntg_int_s32 import * +from swilena_morpho3d_ntg_int_s8 import * +from swilena_morpho3d_ntg_float import * from swilena_structelt3d import * from swilena_w_win3d import * from swilena_conversions3d import * -- Damien Thivolle damien.thivolle(a)lrde.epita.fr