Skip to content

Commit 9cbb2c2

Browse files
committed
[test] Remove unused defines, write test configuration
1 parent d347251 commit 9cbb2c2

10 files changed

Lines changed: 11 additions & 15 deletions

File tree

test/algorithms/overlay/traverse.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
// #define BOOST_GEOMETRY_DEBUG_ENRICH
3131
//#define BOOST_GEOMETRY_DEBUG_RELATIVE_ORDER
3232

33-
// #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
3433
// #define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
3534

3635

test/robustness/convex_hull/random_multi_points.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1110
#define BOOST_GEOMETRY_NO_BOOST_TEST
1211

1312
#include <sstream>

test/robustness/overlay/areal_areal/interior_triangles.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
#include <iomanip>
1414
#include <string>
1515

16-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1716
#define BOOST_GEOMETRY_NO_BOOST_TEST
18-
#define BOOST_GEOMETRY_TIME_OVERLAY
1917

2018
#include <test_overlay_p_q.hpp>
2119

@@ -92,6 +90,7 @@ void test_all(int count, int count_x, int count_y, int offset, p_q_settings cons
9290

9391
int main(int argc, char** argv)
9492
{
93+
BoostGeometryWriteTestConfiguration();
9594
try
9695
{
9796
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/intersection_pies.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
11-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1210
#define BOOST_GEOMETRY_NO_BOOST_TEST
1311

1412
#include <test_overlay_p_q.hpp>
@@ -238,6 +236,7 @@ void test_all(bool multi, bool single_selftangent, p_q_settings const& settings)
238236

239237
int main(int argc, char** argv)
240238
{
239+
BoostGeometryWriteTestConfiguration();
241240
try
242241
{
243242
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/intersection_stars.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#define BOOST_GEOMETRY_NO_BOOST_TEST
1414

15-
1615
#include <test_overlay_p_q.hpp>
1716

1817
#include <boost/program_options.hpp>
@@ -128,6 +127,7 @@ void test_all(std::string const& type, int count, int min_points, int max_points
128127

129128
int main(int argc, char** argv)
130129
{
130+
BoostGeometryWriteTestConfiguration();
131131
try
132132
{
133133
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/intersects.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
#include <iomanip>
1414
#include <string>
1515

16-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1716
#define BOOST_GEOMETRY_NO_BOOST_TEST
18-
//#define BOOST_GEOMETRY_TIME_OVERLAY
1917

2018
#include <test_overlay_p_q.hpp>
2119

@@ -104,6 +102,7 @@ void test_all(int count, int count_x, int count_y, int width_x, p_q_settings con
104102

105103
int main(int argc, char** argv)
106104
{
105+
BoostGeometryWriteTestConfiguration();
107106
try
108107
{
109108
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/random_ellipses_stars.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1110
#define BOOST_GEOMETRY_NO_BOOST_TEST
1211

1312

@@ -187,6 +186,7 @@ void test_all(std::string const& type, int seed, int count, p_q_settings setting
187186

188187
int main(int argc, char** argv)
189188
{
189+
BoostGeometryWriteTestConfiguration();
190190
try
191191
{
192192
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/recursive_polygons.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1110
#define BOOST_GEOMETRY_NO_BOOST_TEST
1211

1312
#include <test_overlay_p_q.hpp>
@@ -141,6 +140,7 @@ void test_all(int seed, int count, int field_size, int level, bool triangular, p
141140

142141
int main(int argc, char** argv)
143142
{
143+
BoostGeometryWriteTestConfiguration();
144144
try
145145
{
146146
namespace po = boost::program_options;

test/robustness/overlay/areal_areal/star_comb.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
88
// http://www.boost.org/LICENSE_1_0.txt)
99

10-
11-
// #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
1210
#define BOOST_GEOMETRY_NO_BOOST_TEST
13-
// #define BOOST_GEOMETRY_TIME_OVERLAY
14-
1511

1612
#include <test_overlay_p_q.hpp>
1713

@@ -71,6 +67,7 @@ void test_all(int count, int star_point_count, int comb_comb_count, double facto
7167

7268
int main(int argc, char** argv)
7369
{
70+
BoostGeometryWriteTestConfiguration();
7471
try
7572
{
7673
namespace po = boost::program_options;

test/robustness/overlay/buffer/recursive_polygons_buffer.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
1313
// http://www.boost.org/LICENSE_1_0.txt)
1414

15+
#define BOOST_GEOMETRY_NO_BOOST_TEST
16+
1517
#if defined(_MSC_VER)
1618
# pragma warning( disable : 4244 )
1719
# pragma warning( disable : 4267 )
@@ -36,6 +38,7 @@
3638

3739
#include <boost/geometry/strategies/buffer.hpp>
3840

41+
#include <geometry_test_common.hpp>
3942
#include <common/common_settings.hpp>
4043
#include <common/make_square_polygon.hpp>
4144

@@ -285,6 +288,7 @@ void test_all(int seed, int count, int level, Settings const& settings)
285288

286289
int main(int argc, char** argv)
287290
{
291+
BoostGeometryWriteTestConfiguration();
288292
try
289293
{
290294
namespace po = boost::program_options;

0 commit comments

Comments
 (0)