* tests/io/fld/fld1d.cc, * tests/io/fld/fld2d.cc, * tests/io/fld/fld3d.cc: Write in different files to allow those tests to be run simultaneously. (cherry picked from commit 357035117860ee79ae50a628f4e91e496905e6fc) Conflicts: milena/ChangeLog --- milena/ChangeLog | 9 +++++++++ milena/tests/io/fld/fld1d.cc | 9 +++++---- milena/tests/io/fld/fld2d.cc | 21 +++++++++++---------- milena/tests/io/fld/fld3d.cc | 9 +++++---- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e01e17b..a180c49 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-03-18 Guillaume Lazzara <z@lrde.epita.fr> + + Make fld tests write in different files. + + * tests/io/fld/fld1d.cc, + * tests/io/fld/fld2d.cc, + * tests/io/fld/fld3d.cc: Write in different files to allow those + tests to be run simultaneously. + 2010-04-08 Roland Levillain <roland@lrde.epita.fr> Help Swilena wrap mln::complex<D>. diff --git a/milena/tests/io/fld/fld1d.cc b/milena/tests/io/fld/fld1d.cc index 00dbf29..9792bd6 100644 --- a/milena/tests/io/fld/fld1d.cc +++ b/milena/tests/io/fld/fld1d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,11 +48,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out1d.fld"); + io::fld::load(test, "out1d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out1d.fld"); mln_assertion(ori == test); } diff --git a/milena/tests/io/fld/fld2d.cc b/milena/tests/io/fld/fld2d.cc index 0ab7aa7..33943dd 100644 --- a/milena/tests/io/fld/fld2d.cc +++ b/milena/tests/io/fld/fld2d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,11 +55,11 @@ int main() image2d<int_u8> ori, test; io::pgm::load(ori, MLN_IMG_DIR "/lena.pgm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -69,11 +70,11 @@ int main() image2d<int_u16> ori, test; io::ppm::load(ori, MLN_IMG_DIR "/lena_16.ppm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -92,11 +93,11 @@ int main() ori(p) = random() / RAND_MAX; } - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); { mln_piter_(image2d<float>) p(domain); diff --git a/milena/tests/io/fld/fld3d.cc b/milena/tests/io/fld/fld3d.cc index 2813607..525241d 100644 --- a/milena/tests/io/fld/fld3d.cc +++ b/milena/tests/io/fld/fld3d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,11 +50,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out3d.fld"); + io::fld::load(test, "out3d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out3d.fld"); mln_assertion(ori == test); } -- 1.7.2.5