From b9ea14b76d2a1060336d8383e0b50b7bf19aea84 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Thu, 10 Apr 2014 23:39:10 +0300 Subject: [PATCH 1/2] [test][algorithms] modify Jamfile to work with unit tests for P/P and L/L set ops (need to require that the unit test framework library is available for linking) --- test/algorithms/Jamfile.v2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index 3eb3246ca..6c58a5dfd 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -13,6 +13,15 @@ # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +import testing ; + +project boost-geometry-algorithms-test + : + requirements + . + /boost/test//boost_unit_test_framework + ; + test-suite boost-geometry-algorithms : [ run append.cpp : : : msvc:/bigobj ] From 4b7549a39a2dc33b81f4bf61f81a9a72d7ccb5a2 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Fri, 11 Apr 2014 00:04:40 +0300 Subject: [PATCH 2/2] [test][algorithms] do linking of the unit test framework on a per-unit-test basis --- test/algorithms/Jamfile.v2 | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index 6c58a5dfd..374d535ad 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -15,13 +15,6 @@ import testing ; -project boost-geometry-algorithms-test - : - requirements - . - /boost/test//boost_unit_test_framework - ; - test-suite boost-geometry-algorithms : [ run append.cpp : : : msvc:/bigobj ] @@ -36,8 +29,8 @@ test-suite boost-geometry-algorithms [ run covered_by.cpp ] [ run crosses.cpp ] [ run difference.cpp : : : BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE msvc:/bigobj ] - [ run difference_linear_linear.cpp ] - [ run difference_pl_pl.cpp ] + [ run difference_linear_linear.cpp /boost/test//boost_unit_test_framework ] + [ run difference_pl_pl.cpp /boost/test//boost_unit_test_framework ] [ run disjoint.cpp ] [ run distance.cpp : : : msvc:/bigobj ] [ run envelope.cpp ] @@ -45,8 +38,8 @@ test-suite boost-geometry-algorithms [ run expand.cpp ] [ run for_each.cpp ] [ run intersection.cpp : : : BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE msvc:/bigobj ] - [ run intersection_linear_linear.cpp ] - [ run intersection_pl_pl.cpp ] + [ run intersection_linear_linear.cpp /boost/test//boost_unit_test_framework ] + [ run intersection_pl_pl.cpp /boost/test//boost_unit_test_framework ] [ run intersects.cpp ] [ run length.cpp ] [ run make.cpp ] @@ -57,12 +50,12 @@ test-suite boost-geometry-algorithms [ run remove_spikes.cpp ] [ run reverse.cpp ] [ run simplify.cpp ] - [ run sym_difference_linear_linear.cpp ] + [ run sym_difference_linear_linear.cpp /boost/test//boost_unit_test_framework ] [ run touches.cpp ] [ run transform.cpp ] [ run union.cpp : : : BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ] - [ run union_linear_linear.cpp ] - [ run union_pl_pl.cpp ] + [ run union_linear_linear.cpp /boost/test//boost_unit_test_framework ] + [ run union_pl_pl.cpp /boost/test//boost_unit_test_framework ] [ run unique.cpp ] [ run within.cpp ] ;