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

fixup compile on osx and remove tabs in svg tests

Browse source
This commit is contained in:
Dane Springmeyer 2010-07-20 02:12:43 +00:00
parent 789ff19824
commit 1b535430cb
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/cpp_tests/svg_renderer_tests/SConscript
View file

@ -5,16 +5,18 @@ Import ('env')
headers = env['CPPPATH'] headers = env['CPPPATH']
boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
boost_system = 'boost_system%s' % env['BOOST_APPEND'] system = 'boost_system%s' % env['BOOST_APPEND']
regex = 'boost_regex%s' % env['BOOST_APPEND']
libraries = [boost_system, boost_filesystem, 'mapnik2'] libraries = [filesystem, 'mapnik2']
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append(env['ICU_LIB_NAME']) libraries.append(env['ICU_LIB_NAME'])
libraries.append(regex)
if env['HAS_BOOST_SYSTEM']: if env['HAS_BOOST_SYSTEM']:
libraries.append(boost_system) libraries.append(system)
for cpp_test in glob.glob('*_test.cpp'): for cpp_test in glob.glob('*_test.cpp'):
env.Program(cpp_test.replace('.cpp',''), [cpp_test], CPPPATH=headers, LIBS=libraries) env.Program(cpp_test.replace('.cpp',''), [cpp_test], CPPPATH=headers, LIBS=libraries)

9
tests/cpp_tests/svg_renderer_tests/compilation_test.cpp
View file

@ -23,12 +23,13 @@ BOOST_AUTO_TEST_CASE(compile_test_case)
try try
{ {
std::stringstream output_stream; std::stringstream output_stream;
svg_renderer<std::stringstream> renderer(map, output_stream); svg_renderer<std::stringstream> renderer(map, output_stream);
renderer.apply(); renderer.apply();
std::clog << output_stream.str() << "\n";
} }
catch(...) catch(...)
{ {
BOOST_FAIL("Empty implementation throws exception."); BOOST_FAIL("Empty implementation throws exception.");
} }
} }