From 2dcd853a35d103a67e596cd0c06c72e176efa93a Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Thu, 30 Oct 2014 12:07:06 +0100 Subject: [PATCH] [test] Move IO tests from multi directory. --- test/{multi => }/io/dsv/Jamfile.v2 | 2 +- test/{multi => }/io/dsv/multi_dsv.cpp | 0 test/io/wkt/Jamfile.v2 | 1 + test/{multi => }/io/wkt/multi_wkt.cpp | 0 test/multi/Jamfile.v2 | 1 - test/multi/io/Jamfile.v2 | 12 ------------ test/multi/io/wkt/Jamfile.v2 | 15 --------------- 7 files changed, 2 insertions(+), 29 deletions(-) rename test/{multi => }/io/dsv/Jamfile.v2 (92%) rename test/{multi => }/io/dsv/multi_dsv.cpp (100%) rename test/{multi => }/io/wkt/multi_wkt.cpp (100%) delete mode 100644 test/multi/io/Jamfile.v2 delete mode 100644 test/multi/io/wkt/Jamfile.v2 diff --git a/test/multi/io/dsv/Jamfile.v2 b/test/io/dsv/Jamfile.v2 similarity index 92% rename from test/multi/io/dsv/Jamfile.v2 rename to test/io/dsv/Jamfile.v2 index 1a855ae27..73d818db7 100644 --- a/test/multi/io/dsv/Jamfile.v2 +++ b/test/io/dsv/Jamfile.v2 @@ -8,7 +8,7 @@ # 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-io-dsv +test-suite boost-geometry-io-dsv : [ run multi_dsv.cpp ] ; diff --git a/test/multi/io/dsv/multi_dsv.cpp b/test/io/dsv/multi_dsv.cpp similarity index 100% rename from test/multi/io/dsv/multi_dsv.cpp rename to test/io/dsv/multi_dsv.cpp diff --git a/test/io/wkt/Jamfile.v2 b/test/io/wkt/Jamfile.v2 index c93e26a8e..27813bbf6 100644 --- a/test/io/wkt/Jamfile.v2 +++ b/test/io/wkt/Jamfile.v2 @@ -10,6 +10,7 @@ test-suite boost-geometry-io-wkt : + [ run multi_wkt.cpp ] [ run wkt.cpp ] ; diff --git a/test/multi/io/wkt/multi_wkt.cpp b/test/io/wkt/multi_wkt.cpp similarity index 100% rename from test/multi/io/wkt/multi_wkt.cpp rename to test/io/wkt/multi_wkt.cpp diff --git a/test/multi/Jamfile.v2 b/test/multi/Jamfile.v2 index b38d8c5ad..fb7ed7568 100644 --- a/test/multi/Jamfile.v2 +++ b/test/multi/Jamfile.v2 @@ -9,4 +9,3 @@ # http://www.boost.org/LICENSE_1_0.txt) build-project algorithms ; -build-project io ; \ No newline at end of file diff --git a/test/multi/io/Jamfile.v2 b/test/multi/io/Jamfile.v2 deleted file mode 100644 index 6985a7ab9..000000000 --- a/test/multi/io/Jamfile.v2 +++ /dev/null @@ -1,12 +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 wkt ; -build-project dsv ; diff --git a/test/multi/io/wkt/Jamfile.v2 b/test/multi/io/wkt/Jamfile.v2 deleted file mode 100644 index 50c17cf68..000000000 --- a/test/multi/io/wkt/Jamfile.v2 +++ /dev/null @@ -1,15 +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) - -test-suite boost-geometry-multi-io-wkt - : - [ run multi_wkt.cpp ] - ; -