Skip to content

Commit 3929d92

Browse files
wilhelmbergwilhelmberg
committed
Benchmark: use return values of test runner.
1 parent 291089d commit 3929d92

11 files changed

+52
-40
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*.a
1212
*.swp
1313
*.dylib
14+
mapnik-gyp
1415
plugins/input/*.input
1516
plugins/input/templates/*.input
1617
demo/c++/rundemo

‎benchmark/test_array_allocation.cpp‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -386,61 +386,62 @@ class test7 : public benchmark::test_case
386386

387387
int main(int argc, char** argv)
388388
{
389+
int retVal = 0;
389390
mapnik::parameters params;
390391
benchmark::handle_args(argc,argv,params);
391392
{
392393
test4 test_runner4(params);
393-
run(test_runner4,"calloc");
394+
retVal = retVal | run(test_runner4,"calloc");
394395
}
395396
{
396397
test1 test_runner(params);
397-
run(test_runner,"malloc/memcpy");
398+
retVal = retVal | run(test_runner,"malloc/memcpy");
398399
}
399400
{
400401
test1b test_runner(params);
401-
run(test_runner,"malloc/memset");
402+
retVal = retVal | run(test_runner,"malloc/memset");
402403
}
403404
{
404405
test1c test_runner(params);
405-
run(test_runner,"operator new/std::fill");
406+
retVal = retVal | run(test_runner,"operator new/std::fill");
406407
}
407408
{
408409
test2 test_runner(params);
409-
run(test_runner,"operator new/memcpy");
410+
retVal = retVal | run(test_runner,"operator new/memcpy");
410411
}
411412
{
412413
test3 test_runner(params);
413-
run(test_runner,"vector(N)");
414+
retVal = retVal | run(test_runner,"vector(N)");
414415
}
415416
{
416417
test3b test_runner(params);
417-
run(test_runner,"vector/resize");
418+
retVal = retVal | run(test_runner,"vector/resize");
418419
}
419420
{
420421
test3c test_runner(params);
421-
run(test_runner,"vector/assign");
422+
retVal = retVal | run(test_runner,"vector/assign");
422423
}
423424
{
424425
test3d test_runner(params);
425-
run(test_runner,"deque(N)");
426+
retVal = retVal | run(test_runner,"deque(N)");
426427
}
427428
{
428429
test5 test_runner(params);
429-
run(test_runner,"std::string range");
430+
retVal = retVal | run(test_runner,"std::string range");
430431
}
431432
{
432433
test5b test_runner(params);
433-
run(test_runner,"std::string &[0]");
434+
retVal = retVal | run(test_runner,"std::string &[0]");
434435
}
435436
{
436437
test6 test_runner(params);
437-
run(test_runner,"valarray");
438+
retVal = retVal | run(test_runner,"valarray");
438439
}
439440
#if BOOST_VERSION >= 105400
440441
{
441442
test7 test_runner(params);
442-
run(test_runner,"static_vector");
443+
retVal = retVal | run(test_runner,"static_vector");
443444
}
444445
#endif
445-
return 0;
446+
return retVal;
446447
}

‎benchmark/test_expression_parse.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ int main(int argc, char** argv)
3737
mapnik::parameters params;
3838
benchmark::handle_args(argc,argv,params);
3939
test test_runner(params);
40-
run(test_runner,"expr parsing");
40+
return run(test_runner,"expr parsing");
4141
}

‎benchmark/test_numeric_cast_vs_static_cast.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ int main(int argc, char** argv)
7575
{
7676
mapnik::parameters params;
7777
benchmark::handle_args(argc,argv,params);
78+
int retVal = 0;
7879
{
7980
test_static test_runner(params);
80-
run(test_runner,"static_cast");
81+
retVal = retVal | run(test_runner,"static_cast");
8182
}
8283
{
8384
test_numeric test_runner(params);
84-
run(test_runner,"numeric_cast");
85+
retVal = retVal | run(test_runner,"numeric_cast");
8586
}
86-
return 0;
87+
return retVal;
8788
}

‎benchmark/test_offset_converter.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ int main(int argc, char** argv)
9393
{
9494
mapnik::parameters params;
9595
benchmark::handle_args(argc,argv,params);
96+
int retVal = 0;
9697
{
9798
test_offset test_runner(params);
98-
run(test_runner,"offset_test");
99+
retVal = run(test_runner,"offset_test");
99100
}
100-
return 0;
101+
return retVal;
101102
}

‎benchmark/test_polygon_clipping.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,19 +528,20 @@ int main(int argc, char** argv)
528528
throw std::runtime_error("could not open: '" + filename_ + "'");
529529
std::string wkt_in( (std::istreambuf_iterator<char>(in) ),
530530
(std::istreambuf_iterator<char>()) );
531+
int retVal = 0;
531532
{
532533
test1 test_runner(params,wkt_in,clipping_box);
533-
run(test_runner,"clipping polygon with agg");
534+
retVal = retVal | run(test_runner,"clipping polygon with agg");
534535
}
535536
{
536537
test3 test_runner(params,wkt_in,clipping_box);
537-
run(test_runner,"clipping polygon with boost");
538+
retVal = retVal | run(test_runner,"clipping polygon with boost");
538539
}
539540
/*
540541
{
541542
test4 test_runner(params,wkt_in,clipping_box);
542-
run(test_runner,"clipping polygon with clipper_tree");
543+
retVal = retVal | run(test_runner,"clipping polygon with clipper_tree");
543544
}
544545
*/
545-
return 0;
546+
return retVal;
546547
}

‎benchmark/test_polygon_clipping_rendering.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,30 @@ int main(int argc, char** argv)
5151
mapnik::box2d<double> z1(-20037508.3428,-8317435.0606,20037508.3428,18399242.7298);
5252
// bbox for 16/10491/22911.png
5353
mapnik::box2d<double> z16(-13622912.929097254,6026906.8062295765,-13621689.93664469,6028129.79868214);
54+
int retVal = 0;
5455
{
5556
test test_runner(params,
5657
"benchmark/data/polygon_rendering_clip.xml",
5758
z1);
58-
run(test_runner,"polygon clip render z1");
59+
retVal = retVal | run(test_runner,"polygon clip render z1");
5960
}
6061
{
6162
test test_runner(params,
6263
"benchmark/data/polygon_rendering_no_clip.xml",
6364
z1);
64-
run(test_runner,"polygon noclip render z1");
65+
retVal = retVal | run(test_runner,"polygon noclip render z1");
6566
}
6667
{
6768
test test_runner(params,
6869
"benchmark/data/polygon_rendering_clip.xml",
6970
z16);
70-
run(test_runner,"polygon clip render z16");
71+
retVal = retVal | run(test_runner,"polygon clip render z16");
7172
}
7273
{
7374
test test_runner(params,
7475
"benchmark/data/polygon_rendering_no_clip.xml",
7576
z16);
76-
run(test_runner,"polygon noclip render z16");
77+
retVal = retVal | run(test_runner,"polygon noclip render z16");
7778
}
78-
return 0;
79+
return retVal;
7980
}

‎benchmark/test_proj_transform1.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,34 @@ int main(int argc, char** argv)
6767
std::string to_str("+init=epsg:3857");
6868
std::string from_str2("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
6969
std::string to_str2("+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over");
70+
int retVal = 0;
7071
test test_runner(params,
7172
from_str,
7273
to_str,
7374
from,
7475
to,
7576
true);
76-
run(test_runner,"lonlat->merc epsg");
77+
retVal = retVal | run(test_runner,"lonlat->merc epsg");
7778
test test_runner2(params,
7879
from_str2,
7980
to_str2,
8081
from,
8182
to,
8283
true);
83-
run(test_runner2,"lonlat->merc literal");
84+
retVal = retVal | run(test_runner2,"lonlat->merc literal");
8485
test test_runner3(params,
8586
to_str,
8687
from_str,
8788
to,
8889
from,
8990
true);
90-
run(test_runner3,"merc->lonlat epsg");
91+
retVal = retVal | run(test_runner3,"merc->lonlat epsg");
9192
test test_runner4(params,
9293
to_str2,
9394
from_str2,
9495
to,
9596
from,
9697
true);
97-
return run(test_runner4,"merc->lonlat literal");
98+
retVal = retVal | run(test_runner4,"merc->lonlat literal");
99+
return retVal;
98100
}

‎benchmark/test_rendering.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class test : public benchmark::test_case
8888

8989
int main(int argc, char** argv)
9090
{
91+
int retVal = 0;
9192
try
9293
{
9394
mapnik::parameters params;
@@ -102,13 +103,13 @@ int main(int argc, char** argv)
102103
mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
103104
{
104105
test test_runner(params);
105-
run(test_runner,*name);
106+
retVal = run(test_runner,*name);
106107
}
107108
}
108109
catch (std::exception const& ex)
109110
{
110111
std::clog << ex.what() << "\n";
111112
return -1;
112113
}
113-
return 0;
114+
return retVal;
114115
}

‎benchmark/test_rendering_shared_map.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ class test : public benchmark::test_case
145145

146146
int main(int argc, char** argv)
147147
{
148+
int retVal = 0;
148149
try
149150
{
150151
mapnik::parameters params;
@@ -159,13 +160,13 @@ int main(int argc, char** argv)
159160
mapnik::datasource_cache::instance().register_datasources("./plugins/input/");
160161
{
161162
test test_runner(params);
162-
run(test_runner,*name);
163+
retVal = run(test_runner,*name);
163164
}
164165
}
165166
catch (std::exception const& ex)
166167
{
167168
std::clog << ex.what() << "\n";
168169
return -1;
169170
}
170-
return 0;
171+
return retVal;
171172
}

0 commit comments

Comments
 (0)