proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 15:29:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Link tests with shared library, not static

Browse Source 
Signed-off-by: Vicent Marti <tanoku@gmail.com>
This commit is contained in:
Vicent Marti 2010-12-18 03:16:04 +02:00
parent b5ced41e85
commit f70cbbc511
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wscript
View File

@ -82,7 +82,7 @@ def build(bld):
# command '[build|clean]-tests' # command '[build|clean]-tests'
elif bld.variant == 'tests': elif bld.variant == 'tests':
build_library(bld, 'cstlib') build_library(bld, 'cshlib')
build_tests(bld) build_tests(bld)
# command 'build|clean|install|uninstall': by default, run # command 'build|clean|install|uninstall': by default, run
@ -167,8 +167,7 @@ def build_tests(bld):
includes=['src', 'tests'], includes=['src', 'tests'],
defines=['TEST_TOC="%s.toc"' % test_name, 'TEST_RESOURCES="%s"' % resources_path], defines=['TEST_TOC="%s.toc"' % test_name, 'TEST_RESOURCES="%s"' % resources_path],
install_path=None, install_path=None,
stlib=['git2'], # link with the git2 static lib we've just compiled' shlibpath=[directory.find_node('build/tests/').abspath()],
stlibpath=[directory.find_node('build/tests/').abspath(), directory.abspath()],
use=['test_helper', 'git2'] + ALL_LIBS # link with all the libs we know use=['test_helper', 'git2'] + ALL_LIBS # link with all the libs we know
# libraries which are not enabled won't link # libraries which are not enabled won't link
) )
@ -201,17 +200,28 @@ class _run_tests(Context):
fun = 'run_tests' fun = 'run_tests'
def run_tests(ctx): def run_tests(ctx):
import shutil, tempfile, sys import shutil, tempfile, sys, os
failed = False failed = False
test_folder = tempfile.mkdtemp() test_folder = tempfile.mkdtemp()
build_folder = ctx.path.find_node('build/tests/')
test_glob = 'build/tests/t????-*' test_glob = 'build/tests/t????-*'
environ = os.environ.copy()
environ_tail = ""
if sys.platform == 'win32': if sys.platform == 'win32':
test_glob += '.exe' test_glob += '.exe'
environ_var, environ_separator = 'PATH', ';'
else:
environ_var, environ_separator = 'LD_LIBRARY_PATH', ':'
if environ_var in environ:
environ_tail = environ_separator + environ[environ_var]
environ[environ_var] = build_folder.abspath() + environ_tail
for test in ctx.path.ant_glob(test_glob): for test in ctx.path.ant_glob(test_glob):
if ctx.exec_command(test.abspath(), cwd=test_folder) != 0: if ctx.exec_command(test.abspath(), cwd=test_folder, env=environ) != 0:
failed = True failed = True
break break