Author: brane
Date: Thu Jul 3 11:16:48 2025
New Revision: 1926938
URL: http://svn.apache.org/viewvc?rev=1926938&view=rev
Log:
SERF-183: In the SCons build, inherid LD_LIBRARY_PATH from the environment
for running the tests.
* SConstruct: Lookg for LD_LIBRARY_PATH in the environment, and expand
construction environment variables om LIBPATH.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1926938&r1=1926937&r2=1926938&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Thu Jul 3 11:16:48 2025
@@ -751,7 +751,10 @@ test_app = ("%s %s %s %s") % (sys.execut
test_env = {'PATH' : os.environ['PATH'],
'srcdir' : src_dir}
if sys.platform != 'win32':
- test_env['LD_LIBRARY_PATH'] = ':'.join(tenv.get('LIBPATH', []))
+ os_library_path = os.environ.get('LD_LIBRARY_PATH')
+ os_library_path = [os_library_path] if os_library_path else []
+ ld_library_path = [tenv.subst(p) for p in tenv.get('LIBPATH', [])]
+ test_env['LD_LIBRARY_PATH'] = ':'.join(ld_library_path + os_library_path)
env.AlwaysBuild(env.Alias('check', TEST_EXES, test_app, ENV=test_env))
testall_files = [
