From 60b72524c1ce36a0da1d07de91d5b20d23229ff3 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 11 Aug 2014 18:51:38 -0700 Subject: [PATCH] font_registration test: only modify severity temporarily --- tests/cpp_tests/font_registration_test.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/cpp_tests/font_registration_test.cpp b/tests/cpp_tests/font_registration_test.cpp index 94d65eb47..7126d14ff 100644 --- a/tests/cpp_tests/font_registration_test.cpp +++ b/tests/cpp_tests/font_registration_test.cpp @@ -23,7 +23,7 @@ int main(int argc, char** argv) try { mapnik::logger logger; - logger.set_severity(mapnik::logger::none); + mapnik::logger::severity_type original_severity = logger.get_severity(); BOOST_TEST(set_working_dir(args)); @@ -45,6 +45,8 @@ int main(int argc, char** argv) BOOST_TEST( face_names.size() == 0 ); // directories without fonts + // silence warnings here by altering the logging severity + logger.set_severity(mapnik::logger::none); std::string src("src"); // an empty directory will not return true // we need to register at least one font and not fail on any @@ -62,6 +64,9 @@ int main(int argc, char** argv) BOOST_TEST( mapnik::freetype_engine::register_fonts("tests/data/fonts/intentionally-broken.ttf") == false ); BOOST_TEST( mapnik::freetype_engine::face_names().size() == 0 ); + // now restore the original severity + logger.set_severity(original_severity); + // register unifont, since we know it sits in the root fonts/ dir BOOST_TEST( mapnik::freetype_engine::register_fonts(fontdir) ); face_names = mapnik::freetype_engine::face_names();