https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
More core-related tests to tests/core/.
* tests/core/: New directory.
* tests/core_category.cc,
* tests/core_clone.cc,
* tests/core_exact.cc,
* tests/core_initialize.cc,
* tests/t_image.cc:
Move...
* tests/core/category.cc,
* tests/core/clone.cc,
* tests/core/exact.cc,
* tests/core/initialize.cc,
* tests/core/t_image.cc:
...here.
Adjust paths in documentation.
* tests/core/Makefile.am: New.
* tests/Makefile.am (SUBDIRS): Add core.
(check_PROGRAMS): Remove core_category, core_clone, core_exact and
core_initialize.
Makefile.am | 11 +----------
core/Makefile.am | 18 ++++++++++++++++++
core/category.cc | 6 +++++-
core/clone.cc | 2 +-
core/exact.cc | 2 +-
core/initialize.cc | 2 +-
6 files changed, 27 insertions(+), 14 deletions(-)
Index: tests/Makefile.am
--- tests/Makefile.am (revision 1556)
+++ tests/Makefile.am (working copy)
@@ -7,6 +7,7 @@
accu \
border \
canvas \
+ core \
display \
draw \
fun \
@@ -39,10 +40,6 @@
convert_to_image \
convert_to_tiles \
convert_to_p_array \
- core_category \
- core_clone \
- core_exact \
- core_initialize \
\
debug_println \
debug_println_with_border \
@@ -176,10 +173,6 @@
convert_to_image_SOURCES = convert_to_image.cc
convert_to_tiles_SOURCES = convert_to_tiles.cc
convert_to_p_array_SOURCES = convert_to_p_array.cc
-core_category_SOURCES = core_category.cc
-core_clone_SOURCES = core_clone.cc
-core_exact_SOURCES = core_exact.cc
-core_initialize_SOURCES = core_initialize.cc
debug_println_SOURCES = debug_println.cc
debug_println_with_border_SOURCES = debug_println_with_border.cc
@@ -241,8 +234,6 @@
morpho_opening_area_SOURCES = morpho_opening_area.cc
morpho_thinning_SOURCES = morpho_thinning.cc
-norm_l2_SOURCES = norm_l2.cc
-
pixel_SOURCES = pixel.cc
pixter1d_SOURCES = pixter1d.cc
pixter2d_SOURCES = pixter2d.cc
Index: tests/core/category.cc
--- tests/core/category.cc (revision 0)
+++ tests/core/category.cc (working copy)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/core_category.cc
+/*! \file tests/core/category.cc
*
* \brief Tests on mln::category.
*/
@@ -33,6 +33,10 @@
#include <mln/core/category.hh>
+// FIXME: Is this test actually complete? I.e., does it consist in a
+// simple file inclusion? If so, state this here. If not, complete
+// this test.
+
int main()
{
using namespace mln;
Index: tests/core/clone.cc
--- tests/core/clone.cc (revision 0)
+++ tests/core/clone.cc (working copy)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/core_clone.cc
+/*! \file tests/core/clone.cc
*
* \brief Tests on mln::clone.
*/
Index: tests/core/initialize.cc
--- tests/core/initialize.cc (revision 0)
+++ tests/core/initialize.cc (working copy)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/core_initialize.cc
+/*! \file tests/core/initialize.cc
*
* \brief Tests on mln::initialize.
*/
Index: tests/core/exact.cc
--- tests/core/exact.cc (revision 0)
+++ tests/core/exact.cc (working copy)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/core_exact.cc
+/*! \file tests/core/exact.cc
*
* \brief Tests on mln::exact.
*/
Index: tests/core/Makefile.am
--- tests/core/Makefile.am (revision 0)
+++ tests/core/Makefile.am (revision 0)
@@ -0,0 +1,18 @@
+## Process this file through Automake to create Makefile.in -*- Makefile -*-
+
+include $(top_srcdir)/milena/tests/tests.mk
+
+check_PROGRAMS = \
+ category \
+ clone \
+ exact \
+ initialize \
+ t_image
+
+category_SOURCES = category.cc
+clone_SOURCES = clone.cc
+exact_SOURCES = exact.cc
+initialize_SOURCES = initialize.cc
+t_image_SOURCES = t_image.cc
+
+TESTS = $(check_PROGRAMS)