Add scons build flag test_installed.

When set, build unit tests for an already installed library.

Author: pavoljuhas

SConstruct

@@ -45,6 +45,8 @@ vars = Variables('sconsvars.py')
 
 vars.Add('tests',
     'Fixed-string patterns for selecting unit test sources.', None)
+vars.Add(BoolVariable('test_installed',
+    'build unit tests using the installed library.', False))
 vars.Add(EnumVariable('build',
     'compiler settings', 'fast',
     allowed_values=('debug', 'fast')))

conda-recipe/build.sh

@@ -12,11 +12,8 @@ MYNCPU=$(( (CPU_COUNT > 8) ? 8 : CPU_COUNT ))
 # Apply sconscript.local customizations.
 cp ${RECIPE_DIR}/sconscript.local ./
 
-# Build the library and unit test program.
-scons -j $MYNCPU lib alltests
+# Build and install the library.
+scons -j $MYNCPU lib install prefix=$PREFIX
 
-# Execute unit tests.
-scons test
-
-# Install the library.
-scons install prefix=$PREFIX
+# Execute unit tests for the installed library.
+scons -j $MYNCPU test prefix=$PREFIX test_installed=yes

src/SConscript

@@ -77,6 +77,15 @@ env['lib_datafiles'] = []
 
 # Subsidiary SConscripts -----------------------------------------------------
 
+# Determine if unit tests need to be built.
+build_tests = set(('test', 'alltests')).intersection(COMMAND_LINE_TARGETS)
+
+# Short circuit if we test an already installed library.  Do not define
+# any further targets as they may conflict with the installed files.
+if build_tests and env['test_installed']:
+    SConscript('tests/SConscript')
+    Return()
+
 # Load the version script first to resolve the majorminor tuple
 SConscript('diffpy/SConscript.version')
 
@@ -104,7 +113,8 @@ Default(lib)
 
 # Define targets related to testing.  Do so only when testing is requested.
 # This enables library build on machines without cxxtest.
-if set(('test', 'alltests')).intersection(COMMAND_LINE_TARGETS):
+if build_tests:
+    assert not env['test_installed']
     SConscript('tests/SConscript')
 
 # Installation targets.

src/tests/SConscript

@@ -1,18 +1,27 @@
 import os
 import re
 
-Import('env', 'GlobSources', 'libdiffpy')
+Import('env', 'GlobSources')
 
 # Environment for building unit test driver
 env_test = env.Clone(CXXTEST_SUFFIX='.hpp')
 env_test.Tool('cxxtest')
-lib_dir = libdiffpy[0].dir.abspath
+
+if env['test_installed']:
+    # build unit tests for the installed library
+    env_test['CPPPATH'].remove(Dir('..'))
+    env_test.PrependUnique(CPPPATH=env['includedir'], delete_existing=1)
+    env_test['lib_includes'] = []
+    lib_dir = env['libdir']
+else:
+    # build unit tests for this code repository
+    Import('libdiffpy')
+    lib_dir = libdiffpy[0].dir.abspath
+
 env_test.PrependUnique(LIBS='diffpy', LIBPATH=lib_dir, delete_existing=1)
 env_test.PrependUnique(LINKFLAGS="-Wl,-rpath,%r" % lib_dir)
-# Ensure shared libraries will be found for conda-build.
-if os.environ.get('CONDA_BUILD'):
-    conda_lib = os.environ['PREFIX'] + '/lib'
-    env_test.AppendUnique(LINKFLAGS="-Wl,-rpath,%r" % conda_lib)
+
+# Use only libraries needed for building the unit tests.
 pat = 'diffpy|boost_serialization|ObjCryst'
 keeplibs = lambda s: re.search(pat, str(s))
 env_test.Replace(LIBS=filter(keeplibs, env_test['LIBS']))