This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch next has been updated
via 8e148a2f3b871d60de12d627f02fc01ed7ac4331 (commit)
via f1a7757aa73b3bac1c64ecb1e124633a055f4752 (commit)
via 153c751d590f7825fb11427de07c890ad3dd95eb (commit)
via afefd84215fa6e4c673fd0b1a3a8311ac8ea82ff (commit)
from 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
8e148a2 Fix Milena's unit tests generator's dependencies.
f1a7757 Have Scribo's unit tests pass.
153c751 Catch up with the new interface of Scribo's unit tests generator.
afefd84 Update Scribo's unit tests generator.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++
bootstrap | 5 +++-
milena/ChangeLog | 7 +++++
milena/tests/unit_test/Makefile.am | 2 +-
scribo/ChangeLog | 20 +++++++++++++
scribo/tests/unit_test/Makefile.am | 18 ++++++++----
scribo/tests/unit_test/build_unit_test.sh | 42 ++++++++++++++++++++--------
scribo/tests/unit_test/disabled_tests | 5 +++
scribo/tests/unit_test/unit-tests.mk | 8 +-----
9 files changed, 86 insertions(+), 27 deletions(-)
create mode 100644 scribo/tests/unit_test/disabled_tests
hooks/post-receive
--
Olena, a generic and efficient image processing platform
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch fix-tests has been deleted
was 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e
-----------------------------------------------------------------------
6dd7d249daae01e8ed82f836aa2f88c4a5833d8e Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&).
-----------------------------------------------------------------------
hooks/post-receive
--
Olena, a generic and efficient image processing platform
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch next has been updated
via 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit)
from 68b860f7623d03ea9815fd652300bee661351bdc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
No new revisions were added by this update.
-----------------------------------------------------------------------
Summary of changes:
milena/ChangeLog | 7 +++++++
milena/mln/accu/compute.hh | 6 ++----
2 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
* tests/unit_test/build_unit_test.sh: Catch up with Milena's
version of this script.
* tests/unit_test/Makefile.am (regen-am, $(srcdir)/unit-tests.mk):
Adjust.
* tests/unit_test/disabled_tests: New.
---
scribo/ChangeLog | 10 +++++++
scribo/tests/unit_test/Makefile.am | 18 ++++++++----
scribo/tests/unit_test/build_unit_test.sh | 42 ++++++++++++++++++++--------
scribo/tests/unit_test/disabled_tests | 2 +
4 files changed, 54 insertions(+), 18 deletions(-)
create mode 100644 scribo/tests/unit_test/disabled_tests
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 2375a50..af5c670 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,13 @@
+2010-04-21 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Update Scribo's unit tests generator.
+
+ * tests/unit_test/build_unit_test.sh: Catch up with Milena's
+ version of this script.
+ * tests/unit_test/Makefile.am (regen-am, $(srcdir)/unit-tests.mk):
+ Adjust.
+ * tests/unit_test/disabled_tests: New.
+
2010-04-09 Roland Levillain <roland(a)lrde.epita.fr>
Help g++ 4.1 compile Scribo.
diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am
index 7202de6..16d58b8 100644
--- a/scribo/tests/unit_test/Makefile.am
+++ b/scribo/tests/unit_test/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -22,8 +22,11 @@ include $(top_srcdir)/scribo/tests/tests.mk
# Regen files.
include $(top_srcdir)/build-aux/regen-recursive.mk
regen-am:
- cd $(srcdir) \
- && ./build_unit_test.sh $(abs_top_srcdir)/scribo .
+ cd $(top_srcdir) \
+ && scribo/tests/unit_test/build_unit_test.sh \
+ scribo \
+ scribo/tests/unit_test \
+ scribo/tests/unit_test/disabled_tests
# FIXME: Change build_unit_test.sh so that the action looks like this:
#
@@ -31,9 +34,12 @@ regen-am:
#
# `$(abs_top_srcdir)' is required because of the change of directory
# at the beginning og the action.
-$(srcdir)/unit-tests.mk: $(srcdir)/build_unit_test.sh
- cd $(srcdir) \
- && ./build_unit_test.sh $(abs_top_srcdir)/scribo .
+$(srcdir)/unit-tests.mk: build_unit_test.sh disabled_tests
+ cd $(top_srcdir) \
+ && scribo/tests/unit_test/build_unit_test.sh \
+ scribo \
+ scribo/tests/unit_test \
+ scribo/tests/unit_test/disabled_tests
include $(srcdir)/unit-tests.mk
diff --git a/scribo/tests/unit_test/build_unit_test.sh b/scribo/tests/unit_test/build_unit_test.sh
index d4af384..415ff95 100755
--- a/scribo/tests/unit_test/build_unit_test.sh
+++ b/scribo/tests/unit_test/build_unit_test.sh
@@ -1,5 +1,24 @@
#! /bin/sh
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE)
+#
+# This file is part of Olena.
+#
+# Olena is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, version 2 of the License.
+#
+# Olena is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
+## FIXME: Unify with build-aux/build_unit_test.sh.
+
## FIXME: Don't use `echo -n', as echo's options are not portable.
##
## http://www.gnu.org/software/autoconf/manual/html_node/Limitations-of-Builti…
@@ -11,19 +30,18 @@ ECHO_N=printf
# Use the C locale to have a deterministic sort.
export LC_ALL=C
-test $# -eq 2 || { echo "Usage: $0 <scribo path> <output path>" && exit 1; }
+test $# -eq 3 || { echo "Usage: $0 <scanned dir> <output_dir> <disabled_tests>" && exit 1; }
+
+scanned_dir=$1
+output_dir=$2
+disabled_tests=$3
-## 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 "recognition" \
- | grep -v "demo" \
- | sort \
- | sed -e 's/.*\/scribo\/\(.*\)/scribo\/\1/g' \
- | sed 's/\.\.\/\.\.\///g'`
+HEADERS=$(find $scanned_dir -type f -name "*.hh" \
+ | sort \
+ | sed -e 's/.*\/scribo\/\(.*\)/scribo\/\1/g' | sed 's/\.\.\/\.\.\///g' \
+ | comm -23 - "$disabled_tests")
-output=$2/unit-tests.mk
+output="$output_dir/unit-tests.mk"
rm -f "$output"
rm -f scribo_*.cc
@@ -37,7 +55,7 @@ for i in $HEADERS; do
FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'`
# Build .cc.
- cat > $FILE_CC << EOF
+ cat > "$output_dir/$FILE_CC" << EOF
// Unit test for $i.
// Generated by $0, do not modify.
diff --git a/scribo/tests/unit_test/disabled_tests b/scribo/tests/unit_test/disabled_tests
new file mode 100644
index 0000000..6e39306
--- /dev/null
+++ b/scribo/tests/unit_test/disabled_tests
@@ -0,0 +1,2 @@
+scribo/demo/src/mainwindow.hh
+scribo/text/recognition.hh
--
1.5.6.5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch fix-tests has been updated
discards 0df20ed50b4b8f46a13014348b9f76677cb10e13 (commit)
via 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit)
via 68b860f7623d03ea9815fd652300bee661351bdc (commit)
via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit)
via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit)
via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit)
via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (0df20ed50b4b8f46a13014348b9f76677cb10e13)
\
N -- N -- N (6dd7d249daae01e8ed82f836aa2f88c4a5833d8e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
6dd7d24 Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
bootstrap | 10 +++++-----
milena/ChangeLog | 23 +++++++++++++++++++++++
milena/mesh/Makefile.am | 2 +-
milena/mln/core/image/imorph/labeled_image.hh | 4 +++-
milena/mln/io/fld/save.hh | 10 ++++++----
milena/mln/io/fld/write_header.hh | 16 ++++++++--------
milena/tests/util/Makefile.am | 2 ++
scribo/test.cc => milena/tests/util/ord.cc | 4 +---
9 files changed, 62 insertions(+), 22 deletions(-)
rename scribo/test.cc => milena/tests/util/ord.cc (95%)
hooks/post-receive
--
Olena, a generic and efficient image processing platform
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Olena, a generic and efficient image processing platform".
The branch next has been updated
via 68b860f7623d03ea9815fd652300bee661351bdc (commit)
via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit)
via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit)
via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit)
via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit)
from 25eb4fe6f1b8d6217dcfded1ba138b1abb0e4b07 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
68b860f Exercise mln::util::ord.
1441b0f Move a test from Scribo into Milena.
7c82d9a Fix more tests.
d0cba60 Install meshes in $(pkgdatadir)/meshes.
b77547a Unconditionally regen files not recorded in the repository.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
bootstrap | 10 +++++-----
milena/ChangeLog | 23 +++++++++++++++++++++++
milena/mesh/Makefile.am | 2 +-
milena/mln/core/image/imorph/labeled_image.hh | 4 +++-
milena/mln/io/fld/save.hh | 10 ++++++----
milena/mln/io/fld/write_header.hh | 16 ++++++++--------
milena/tests/util/Makefile.am | 2 ++
scribo/test.cc => milena/tests/util/ord.cc | 4 +---
9 files changed, 62 insertions(+), 22 deletions(-)
rename scribo/test.cc => milena/tests/util/ord.cc (95%)
hooks/post-receive
--
Olena, a generic and efficient image processing platform