From 23878cf03ecc2dc83fe888e4dd05fab549835498 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 22 May 2013 09:21:56 -0700
Subject: [PATCH] fix #1858

---
 SConstruct               |  7 ++--
 tests/cpp_tests/build.py | 75 ++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/SConstruct b/SConstruct
index 488c36193..f36603501 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1867,11 +1867,10 @@ if not HELP_REQUESTED:
     SConscript('fonts/build.py')
 
     # build C++ tests
-    if env['CPP_TESTS']:
-        SConscript('tests/cpp_tests/build.py')
+    SConscript('tests/cpp_tests/build.py')
 
-        if env['SVG_RENDERER']:
-            SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
+    if env['CPP_TESTS'] and env['SVG_RENDERER']:
+        SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
 
     if env['BENCHMARK']:
         SConscript('benchmark/build.py')
diff --git a/tests/cpp_tests/build.py b/tests/cpp_tests/build.py
index d47c167bc..af79532bf 100644
--- a/tests/cpp_tests/build.py
+++ b/tests/cpp_tests/build.py
@@ -6,40 +6,41 @@ Import ('env')
 
 test_env = env.Clone()
 
-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']:
-    test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS'])
-    test_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
-
-for cpp_test in glob.glob('*_test.cpp'):
-    name = cpp_test.replace('.cpp','-bin')
-    source_files = [cpp_test]
-    test_program = None
-    # enable for faster compile while developing just this test
-    #if 'agg_blend_src_over_test' in cpp_test:
-    if False:
-        # customization here for faster compile
-        agg_env = Environment(ENV=os.environ)
-        agg_env['CXX'] = env['CXX']
-        agg_env['CXXFLAGS'] = env['CXXFLAGS']
-        if 'agg' in test_env['LIBS']:
-            agg_env.AppendUnique(LIBS='agg')
-        agg_env.Append(CPPPATH = '#deps/agg/include')
-        agg_env.Append(LIBPATH = '#deps/agg')
-        agg_env['CPPPATH'] = ['#deps/agg/include',env['BOOST_INCLUDES']]
-        test_program = agg_env.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
-    else:
-        test_env_local = test_env.Clone()
-        if 'csv_parse' in cpp_test:
-            source_files += glob.glob('../../plugins/input/csv/' + '*.cpp')
-        test_program = test_env_local.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
-        Depends(test_program, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
-    # build locally if installing
-    if 'install' in COMMAND_LINE_TARGETS:
-        env.Alias('install',test_program)
+if not env['CPP_TESTS']:
+    for cpp_test_bin in glob.glob('*-bin'):
+        os.unlink(cpp_test_bin)
+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']:
+        test_env.PrependUnique(CPPPATH=test_env['CAIRO_CPPPATHS'])
+        test_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
+    for cpp_test in glob.glob('*_test.cpp'):
+        name = cpp_test.replace('.cpp','-bin')
+        source_files = [cpp_test]
+        test_program = None
+        # enable for faster compile while developing just this test
+        #if 'agg_blend_src_over_test' in cpp_test:
+        if False:
+            # customization here for faster compile
+            agg_env = Environment(ENV=os.environ)
+            agg_env['CXX'] = env['CXX']
+            agg_env['CXXFLAGS'] = env['CXXFLAGS']
+            if 'agg' in test_env['LIBS']:
+                agg_env.AppendUnique(LIBS='agg')
+            agg_env.Append(CPPPATH = '#deps/agg/include')
+            agg_env.Append(LIBPATH = '#deps/agg')
+            agg_env['CPPPATH'] = ['#deps/agg/include',env['BOOST_INCLUDES']]
+            test_program = agg_env.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
+        else:
+            test_env_local = test_env.Clone()
+            if 'csv_parse' in cpp_test:
+                source_files += glob.glob('../../plugins/input/csv/' + '*.cpp')
+            test_program = test_env_local.Program(name, source=source_files, LINKFLAGS=env['CUSTOM_LDFLAGS'])
+            Depends(test_program, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
+        # build locally if installing
+        if 'install' in COMMAND_LINE_TARGETS:
+            env.Alias('install',test_program)