sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove uneeded dependence of cpp tests on sqlite

Browse source
This commit is contained in:
Dane Springmeyer 2013-05-25 17:07:08 -07:00
parent 4bd63ce7a0
commit 37a1c07051
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/cpp_tests/build.py
View file

@ -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']:

23
tests/cpp_tests/exceptions_test.cpp
View file

@ -22,10 +22,6 @@
#include <vector>
#include <algorithm>
extern "C" {
#include <sqlite3.h>
}
int main(int argc, char** argv)
{
std::vector<std::string> 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";