From 37a1c07051e03e26792e957470eaef665c8d1bae Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 25 May 2013 17:07:08 -0700 Subject: [PATCH] remove uneeded dependence of cpp tests on sqlite --- tests/cpp_tests/build.py | 1 - tests/cpp_tests/exceptions_test.cpp | 23 ----------------------- 2 files changed, 24 deletions(-) diff --git a/tests/cpp_tests/build.py b/tests/cpp_tests/build.py index af79532bf..fe199e99b 100644 --- a/tests/cpp_tests/build.py +++ b/tests/cpp_tests/build.py @@ -12,7 +12,6 @@ if not env['CPP_TESTS']: else: test_env['LIBS'] = copy(env['LIBMAPNIK_LIBS']) test_env.AppendUnique(LIBS='mapnik') - test_env.AppendUnique(LIBS='sqlite3') test_env.AppendUnique(CXXFLAGS='-g') test_env['CXXFLAGS'] = copy(test_env['LIBMAPNIK_CXXFLAGS']) if test_env['HAS_CAIRO']: diff --git a/tests/cpp_tests/exceptions_test.cpp b/tests/cpp_tests/exceptions_test.cpp index 28b397c8b..d75b8e6cf 100644 --- a/tests/cpp_tests/exceptions_test.cpp +++ b/tests/cpp_tests/exceptions_test.cpp @@ -22,10 +22,6 @@ #include #include -extern "C" { -#include -} - int main(int argc, char** argv) { std::vector args; @@ -92,25 +88,6 @@ int main(int argc, char** argv) } } - /* - // not working, oddly segfaults valgrind - try { - sqlite3_initialize(); - // http://stackoverflow.com/questions/11107703/sqlite3-sigsegvs-with-valgrind - sqlite3_config(SQLITE_CONFIG_HEAP, malloc (1024*1024), 1024*1024, 64); - mapnik::datasource_cache::instance().register_datasource("./plugins/input/sqlite.input"); - mapnik::parameters p; - p["type"]="sqlite"; - p["file"]="tests/data/sqlite/world.sqlite"; - p["table"]="world_merc"; - mapnik::datasource_cache::instance().create(p); - sqlite3_shutdown(); - BOOST_TEST(true); - } catch (...) { - BOOST_TEST(false); - } - */ - if (!::boost::detail::test_errors()) { if (quiet) std::clog << "\x1b[1;32m.\x1b[0m"; else std::clog << "C++ exceptions: \x1b[1;32m✓ \x1b[0m\n";