* milena/tests/arith/all_headers.cc, * milena/tests/border/all_headers.cc, * milena/tests/display/all_headers.cc, * milena/tests/draw/all_headers.cc, * milena/tests/logical/all_headers.cc, * milena/tests/util/all_headers.cc: Remove. * milena/tests/arith/Makefile.am, * milena/tests/border/Makefile.am, * milena/tests/data/Makefile.am, * milena/tests/draw/Makefile.am, * milena/tests/logical/Makefile.am (check_PROGRAM): Remove all_headers. (all_headers_SOURCES): Remove. * milena/tests/all_headers.cc, * milena/tests/display/Makefile.am: Clean up. Aesthetic changes. --- milena/ChangeLog | 23 +++++++++++++++++++++++ milena/tests/all_headers.cc | 4 +++- milena/tests/arith/Makefile.am | 2 -- milena/tests/arith/all_headers.cc | 31 ------------------------------- milena/tests/border/Makefile.am | 2 -- milena/tests/border/all_headers.cc | 31 ------------------------------- milena/tests/data/Makefile.am | 2 -- milena/tests/display/Makefile.am | 12 +++++------- milena/tests/display/all_headers.cc | 31 ------------------------------- milena/tests/draw/Makefile.am | 2 -- milena/tests/draw/all_headers.cc | 31 ------------------------------- milena/tests/logical/Makefile.am | 2 -- milena/tests/logical/all_headers.cc | 31 ------------------------------- milena/tests/util/all_headers.cc | 31 ------------------------------- 14 files changed, 31 insertions(+), 204 deletions(-) delete mode 100644 milena/tests/arith/all_headers.cc delete mode 100644 milena/tests/border/all_headers.cc delete mode 100644 milena/tests/display/all_headers.cc delete mode 100644 milena/tests/draw/all_headers.cc delete mode 100644 milena/tests/logical/all_headers.cc delete mode 100644 milena/tests/util/all_headers.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e413ac..486904c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1004,6 +1004,29 @@ 2009-06-10 Roland Levillain <roland@lrde.epita.fr> + Simplify all_headers tests: keep a single one at the top-level. + + * milena/tests/arith/all_headers.cc, + * milena/tests/border/all_headers.cc, + * milena/tests/display/all_headers.cc, + * milena/tests/draw/all_headers.cc, + * milena/tests/logical/all_headers.cc, + * milena/tests/util/all_headers.cc: + Remove. + * milena/tests/arith/Makefile.am, + * milena/tests/border/Makefile.am, + * milena/tests/data/Makefile.am, + * milena/tests/draw/Makefile.am, + * milena/tests/logical/Makefile.am + (check_PROGRAM): Remove all_headers. + (all_headers_SOURCES): Remove. + * milena/tests/all_headers.cc, + * milena/tests/display/Makefile.am: + Clean up. + Aesthetic changes. + +2009-06-10 Roland Levillain <roland@lrde.epita.fr> + * mln/io/pbm/load.hh: Repair the copyright header. 2009-06-09 Thierry Geraud <thierry.geraud@lrde.epita.fr> diff --git a/milena/tests/all_headers.cc b/milena/tests/all_headers.cc index 038a2db..29f4536 100644 --- a/milena/tests/all_headers.cc +++ b/milena/tests/all_headers.cc @@ -23,9 +23,11 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file tests/all_headers.cc +/// \brief Check all Milena's headers. + #include <mln/all.hh> int main () { - } diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index 5476af6..c7539a7 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -20,14 +20,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ diff_abs \ minus \ plus \ revert \ times -all_headers_SOURCES = all_headers.cc diff_abs_SOURCES = diff_abs.cc minus_SOURCES = minus.cc plus_SOURCES = plus.cc diff --git a/milena/tests/arith/all_headers.cc b/milena/tests/arith/all_headers.cc deleted file mode 100644 index 7536314..0000000 --- a/milena/tests/arith/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/arith/all.hh> - -int main() -{ - -} diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index efdd1c2..9337423 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -21,7 +21,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ adjust \ - all_headers \ duplicate \ equalize \ fill \ @@ -43,7 +42,6 @@ check_PROGRAMS = \ resize adjust_SOURCES = adjust.cc -all_headers_SOURCES = all_headers.cc duplicate_SOURCES = duplicate.cc equalize_SOURCES = equalize.cc fill_SOURCES = fill.cc diff --git a/milena/tests/border/all_headers.cc b/milena/tests/border/all_headers.cc deleted file mode 100644 index 3d132a2..0000000 --- a/milena/tests/border/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/border/all.hh> - -int main() -{ - -} diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 2dfc0ba..a87c109 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = approx naive check_PROGRAMS = \ abs \ - all_headers \ apply \ compare \ compute \ @@ -44,7 +43,6 @@ check_PROGRAMS = \ update abs_SOURCES = abs.cc -all_headers_SOURCES = all_headers.cc apply_SOURCES = apply.cc compare_SOURCES = compare.cc compute_SOURCES = compute.cc diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am index 719b8eb..40752fe 100644 --- a/milena/tests/display/Makefile.am +++ b/milena/tests/display/Makefile.am @@ -19,12 +19,10 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = - +# Remember not to execute display tests by default. They require a +# running X11 server (as well as a `pkill' binary...). Perform the +# necessary checks at configure time first. -# FIXME: Don't execute `save' and `save_and_show' by default! These -# tests require a running X11 server (as well as a `pkill' binary...). -# Perform the necessary checks at configure time first. -#TESTS = $(check_PROGRAMS) +check_PROGRAMS = -TESTS = +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/display/all_headers.cc b/milena/tests/display/all_headers.cc deleted file mode 100644 index 822ef72..0000000 --- a/milena/tests/display/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2008, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/display/all.hh> - -int main() -{ - -} diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index addb33d..3cb7692 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -20,11 +20,9 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ line \ graph -all_headers_SOURCES = all_headers.cc line_SOURCES = line.cc graph_SOURCES = graph.cc diff --git a/milena/tests/draw/all_headers.cc b/milena/tests/draw/all_headers.cc deleted file mode 100644 index c6f4506..0000000 --- a/milena/tests/draw/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/draw/all.hh> - -int main() -{ - -} diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index 17bfc31..d095301 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -20,14 +20,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - all_headers \ and \ and_not \ not \ or \ xor -all_headers_SOURCES = all_headers.cc and_SOURCES = and.cc and_not_SOURCES = and_not.cc not_SOURCES = not.cc diff --git a/milena/tests/logical/all_headers.cc b/milena/tests/logical/all_headers.cc deleted file mode 100644 index e5bc299..0000000 --- a/milena/tests/logical/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/logical/all.hh> - -int main() -{ - -} diff --git a/milena/tests/util/all_headers.cc b/milena/tests/util/all_headers.cc deleted file mode 100644 index 9bf0ce9..0000000 --- a/milena/tests/util/all_headers.cc +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2007, 2009 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/>. -// -// As a special exception, you may use this file as part of a free -// software project without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to produce -// an executable, this file does not by itself cause the resulting -// executable to be covered by the GNU General Public License. This -// exception does not however invalidate any other reasons why the -// executable file might be covered by the GNU General Public License. - -#include <mln/util/all.hh> - -int main() -{ - -} -- 1.6.1.2