From 9fec00c796dd10ad99141f5a8d4af5976f796b5e Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Thu, 30 Oct 2014 14:04:14 +0100 Subject: [PATCH] [test] Move the rest of the tests from multi directory and remove this directory. --- test/Jamfile.v2 | 1 - test/algorithms/Jamfile.v2 | 17 +++++++++++ test/{multi => }/algorithms/multi_area.cpp | 0 .../{multi => }/algorithms/multi_centroid.cpp | 0 test/{multi => }/algorithms/multi_clear.cpp | 0 test/{multi => }/algorithms/multi_convert.cpp | 0 .../algorithms/multi_convex_hull.cpp | 0 test/{multi => }/algorithms/multi_correct.cpp | 0 .../{multi => }/algorithms/multi_envelope.cpp | 0 .../{multi => }/algorithms/multi_for_each.cpp | 0 test/{multi => }/algorithms/multi_length.cpp | 0 .../algorithms/multi_num_geometries.cpp | 0 .../algorithms/multi_num_interior_rings.cpp | 0 .../algorithms/multi_num_points.cpp | 0 .../algorithms/multi_perimeter.cpp | 0 test/{multi => }/algorithms/multi_reverse.cpp | 0 .../{multi => }/algorithms/multi_simplify.cpp | 0 .../algorithms/multi_transform.cpp | 0 test/{multi => }/algorithms/multi_unique.cpp | 0 test/multi/Jamfile.v2 | 11 ------- test/multi/algorithms/Jamfile.v2 | 29 ------------------- 21 files changed, 17 insertions(+), 41 deletions(-) rename test/{multi => }/algorithms/multi_area.cpp (100%) rename test/{multi => }/algorithms/multi_centroid.cpp (100%) rename test/{multi => }/algorithms/multi_clear.cpp (100%) rename test/{multi => }/algorithms/multi_convert.cpp (100%) rename test/{multi => }/algorithms/multi_convex_hull.cpp (100%) rename test/{multi => }/algorithms/multi_correct.cpp (100%) rename test/{multi => }/algorithms/multi_envelope.cpp (100%) rename test/{multi => }/algorithms/multi_for_each.cpp (100%) rename test/{multi => }/algorithms/multi_length.cpp (100%) rename test/{multi => }/algorithms/multi_num_geometries.cpp (100%) rename test/{multi => }/algorithms/multi_num_interior_rings.cpp (100%) rename test/{multi => }/algorithms/multi_num_points.cpp (100%) rename test/{multi => }/algorithms/multi_perimeter.cpp (100%) rename test/{multi => }/algorithms/multi_reverse.cpp (100%) rename test/{multi => }/algorithms/multi_simplify.cpp (100%) rename test/{multi => }/algorithms/multi_transform.cpp (100%) rename test/{multi => }/algorithms/multi_unique.cpp (100%) delete mode 100644 test/multi/Jamfile.v2 delete mode 100644 test/multi/algorithms/Jamfile.v2 diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d91542951..0f1d36035 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -29,4 +29,3 @@ build-project policies ; build-project io ; build-project util ; build-project views ; -build-project multi ; diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index cd321dd8b..9cd6dc4d0 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -32,6 +32,22 @@ test-suite boost-geometry-algorithms [ run is_valid.cpp : : : msvc:/bigobj ] [ run length.cpp ] [ run make.cpp ] + [ run multi_area.cpp ] + [ run multi_centroid.cpp ] + [ run multi_convert.cpp ] + [ run multi_convex_hull.cpp ] + [ run multi_correct.cpp ] + [ run multi_envelope.cpp ] + [ run multi_for_each.cpp ] + [ run multi_length.cpp ] + [ run multi_num_geometries.cpp ] + [ run multi_num_interior_rings.cpp ] + [ run multi_num_points.cpp ] + [ run multi_perimeter.cpp ] + [ run multi_reverse.cpp ] + [ run multi_simplify.cpp ] + [ run multi_transform.cpp ] + [ run multi_unique.cpp ] [ run num_geometries.cpp ] [ run num_interior_rings.cpp ] [ run num_points.cpp ] @@ -48,5 +64,6 @@ test-suite boost-geometry-algorithms build-project buffer ; build-project detail ; build-project distance ; +build-project overlay ; build-project relational_operations ; build-project set_operations ; diff --git a/test/multi/algorithms/multi_area.cpp b/test/algorithms/multi_area.cpp similarity index 100% rename from test/multi/algorithms/multi_area.cpp rename to test/algorithms/multi_area.cpp diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/algorithms/multi_centroid.cpp similarity index 100% rename from test/multi/algorithms/multi_centroid.cpp rename to test/algorithms/multi_centroid.cpp diff --git a/test/multi/algorithms/multi_clear.cpp b/test/algorithms/multi_clear.cpp similarity index 100% rename from test/multi/algorithms/multi_clear.cpp rename to test/algorithms/multi_clear.cpp diff --git a/test/multi/algorithms/multi_convert.cpp b/test/algorithms/multi_convert.cpp similarity index 100% rename from test/multi/algorithms/multi_convert.cpp rename to test/algorithms/multi_convert.cpp diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/algorithms/multi_convex_hull.cpp similarity index 100% rename from test/multi/algorithms/multi_convex_hull.cpp rename to test/algorithms/multi_convex_hull.cpp diff --git a/test/multi/algorithms/multi_correct.cpp b/test/algorithms/multi_correct.cpp similarity index 100% rename from test/multi/algorithms/multi_correct.cpp rename to test/algorithms/multi_correct.cpp diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/algorithms/multi_envelope.cpp similarity index 100% rename from test/multi/algorithms/multi_envelope.cpp rename to test/algorithms/multi_envelope.cpp diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/algorithms/multi_for_each.cpp similarity index 100% rename from test/multi/algorithms/multi_for_each.cpp rename to test/algorithms/multi_for_each.cpp diff --git a/test/multi/algorithms/multi_length.cpp b/test/algorithms/multi_length.cpp similarity index 100% rename from test/multi/algorithms/multi_length.cpp rename to test/algorithms/multi_length.cpp diff --git a/test/multi/algorithms/multi_num_geometries.cpp b/test/algorithms/multi_num_geometries.cpp similarity index 100% rename from test/multi/algorithms/multi_num_geometries.cpp rename to test/algorithms/multi_num_geometries.cpp diff --git a/test/multi/algorithms/multi_num_interior_rings.cpp b/test/algorithms/multi_num_interior_rings.cpp similarity index 100% rename from test/multi/algorithms/multi_num_interior_rings.cpp rename to test/algorithms/multi_num_interior_rings.cpp diff --git a/test/multi/algorithms/multi_num_points.cpp b/test/algorithms/multi_num_points.cpp similarity index 100% rename from test/multi/algorithms/multi_num_points.cpp rename to test/algorithms/multi_num_points.cpp diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/algorithms/multi_perimeter.cpp similarity index 100% rename from test/multi/algorithms/multi_perimeter.cpp rename to test/algorithms/multi_perimeter.cpp diff --git a/test/multi/algorithms/multi_reverse.cpp b/test/algorithms/multi_reverse.cpp similarity index 100% rename from test/multi/algorithms/multi_reverse.cpp rename to test/algorithms/multi_reverse.cpp diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/algorithms/multi_simplify.cpp similarity index 100% rename from test/multi/algorithms/multi_simplify.cpp rename to test/algorithms/multi_simplify.cpp diff --git a/test/multi/algorithms/multi_transform.cpp b/test/algorithms/multi_transform.cpp similarity index 100% rename from test/multi/algorithms/multi_transform.cpp rename to test/algorithms/multi_transform.cpp diff --git a/test/multi/algorithms/multi_unique.cpp b/test/algorithms/multi_unique.cpp similarity index 100% rename from test/multi/algorithms/multi_unique.cpp rename to test/algorithms/multi_unique.cpp diff --git a/test/multi/Jamfile.v2 b/test/multi/Jamfile.v2 deleted file mode 100644 index fb7ed7568..000000000 --- a/test/multi/Jamfile.v2 +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) -# -# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. -# Copyright (c) 2008-2012 Bruno Lalande, Paris, France. -# Copyright (c) 2009-2012 Mateusz Loskot, London, UK. -# -# Use, modification and distribution is subject to the Boost Software License, -# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -build-project algorithms ; diff --git a/test/multi/algorithms/Jamfile.v2 b/test/multi/algorithms/Jamfile.v2 deleted file mode 100644 index 221c9de38..000000000 --- a/test/multi/algorithms/Jamfile.v2 +++ /dev/null @@ -1,29 +0,0 @@ -# Boost.Geometry (aka GGL, Generic Geometry Library) -# -# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands. -# Copyright (c) 2008-2014 Bruno Lalande, Paris, France. -# Copyright (c) 2009-2014 Mateusz Loskot, London, UK. -# -# Use, modification and distribution is subject to the Boost Software License, -# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -test-suite boost-geometry-multi-algorithms - : - [ run multi_area.cpp ] - [ run multi_centroid.cpp ] - [ run multi_convert.cpp ] - [ run multi_convex_hull.cpp ] - [ run multi_correct.cpp ] - [ run multi_envelope.cpp ] - [ run multi_for_each.cpp ] - [ run multi_length.cpp ] - [ run multi_num_geometries.cpp ] - [ run multi_num_interior_rings.cpp ] - [ run multi_num_points.cpp ] - [ run multi_perimeter.cpp ] - [ run multi_reverse.cpp ] - [ run multi_simplify.cpp ] - [ run multi_transform.cpp ] - [ run multi_unique.cpp ] - ;