https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Have `make all' behave as expected in tests/accu/.
* tests/accu/all.cc: Rename as...
* tests/accu/all_accus.cc: ...this, so that this test is not
confused with Make's `all' target.
Adjust.
Wrap long lines.
* tests/accu/Makefile.am: Adjust.
Makefile.am | 4 ++--
all_accus.cc | 12 +++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
Index: tests/accu/Makefile.am
--- tests/accu/Makefile.am (revision 1741)
+++ tests/accu/Makefile.am (working copy)
@@ -3,7 +3,7 @@
include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
-all \
+ all_accus \
bbox \
compute \
count \
@@ -19,7 +19,7 @@
pair \
tuple
-all_SOURCES = all.cc
+all_accus_SOURCES = all_accus.cc
bbox_SOURCES = bbox.cc
compute_SOURCES = compute.cc
count_SOURCES = count.cc
Index: tests/accu/all_accus.cc
--- tests/accu/all_accus.cc (revision 1740)
+++ tests/accu/all_accus.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 EPITA Research and Development Laboratory
+// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -25,10 +25,8 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/accu/all.cc
- *
- * \brief Tests on all files in mln/accu.
- */
+/// \file tests/accu/all_accus.cc
+/// \brief Tests on all_accus files in mln/accu.
#include <mln/accu/all.hh>
#include <mln/core/point2d.hh>
@@ -40,7 +38,6 @@
using namespace mln;
using namespace mln::accu;
-
bbox<point2d> b;
count_<int> c;
histo< value::set<bool> > h;
@@ -48,7 +45,8 @@
mean_<int> me;
// median< value::set<bool> > med; // FIXME: bool has no min so
workaround!
min_<int> mi;
- // min_h< value::set<bool> > mh; // OK: do not work since bool has no
min/max :)
+ // min_h< value::set<bool> > mh; // OK: do not work since bool has
+ // no min/max :)
min_max_<int> mm;
nil n;
pair_< min_<int>, max_<int> > p;