From 9cc76de27db62ca5bee7e22c3bd80380634aed7f Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 12 Jun 2015 20:51:18 -0700 Subject: [PATCH] benchmark: correctly position memory cleanup --- benchmark/bench_framework.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/benchmark/bench_framework.hpp b/benchmark/bench_framework.hpp index 5e5d4a2d2..6145e8cde 100644 --- a/benchmark/bench_framework.hpp +++ b/benchmark/bench_framework.hpp @@ -67,14 +67,16 @@ void handle_args(int argc, char** argv, mapnik::parameters & params) mapnik::parameters params; \ benchmark::handle_args(argc,argv,params); \ test_class test_runner(params); \ - return run(test_runner,name); \ + auto result = run(test_runner,name); \ + testing::run_cleanup(); \ + return result; \ } \ catch (std::exception const& ex) \ { \ std::clog << ex.what() << "\n"; \ + testing::run_cleanup(); \ return -1; \ } \ - testing::run_cleanup(); \ } \ template