mirror of https://gitlab.com/ita1024/waf.git
javatest: manage environment also for non-java dependencies (ie. JNI / JEP)
This commit is contained in:
parent
68bf3867df
commit
02a1da8828
|
@ -1,6 +1,6 @@
|
||||||
#! /usr/bin/env python
|
#! /usr/bin/env python
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
# Federico Pellegrin, 2017 (fedepell)
|
# Federico Pellegrin, 2019 (fedepell)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Provides Java Unit test support using :py:class:`waflib.Tools.waf_unit_test.utest`
|
Provides Java Unit test support using :py:class:`waflib.Tools.waf_unit_test.utest`
|
||||||
|
@ -11,6 +11,10 @@ standard waf unit test environment. It has been tested with TestNG and JUnit
|
||||||
but should be easily expandable to other frameworks given the flexibility of
|
but should be easily expandable to other frameworks given the flexibility of
|
||||||
ut_str provided by the standard waf unit test environment.
|
ut_str provided by the standard waf unit test environment.
|
||||||
|
|
||||||
|
The extra takes care also of managing non-java dependencies (ie. C/C++ libraries
|
||||||
|
using JNI or Python modules via JEP) and setting up the environment needed to run
|
||||||
|
them.
|
||||||
|
|
||||||
Example usage:
|
Example usage:
|
||||||
|
|
||||||
def options(opt):
|
def options(opt):
|
||||||
|
@ -53,10 +57,91 @@ The runner class presence on the system is checked for at configuration stage.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from waflib import Task, TaskGen, Options
|
from waflib import Task, TaskGen, Options, Errors, Utils, Logs
|
||||||
|
from waflib.Tools import ccroot
|
||||||
|
|
||||||
|
def _process_use_rec(self, name):
|
||||||
|
"""
|
||||||
|
Recursively process ``use`` for task generator with name ``name``..
|
||||||
|
Used by javatest_process_use.
|
||||||
|
"""
|
||||||
|
if name in self.javatest_use_not or name in self.javatest_use_seen:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
tg = self.bld.get_tgen_by_name(name)
|
||||||
|
except Errors.WafError:
|
||||||
|
self.javatest_use_not.add(name)
|
||||||
|
return
|
||||||
|
|
||||||
|
self.javatest_use_seen.append(name)
|
||||||
|
tg.post()
|
||||||
|
|
||||||
|
for n in self.to_list(getattr(tg, 'use', [])):
|
||||||
|
_process_use_rec(self, n)
|
||||||
|
|
||||||
@TaskGen.feature('javatest')
|
@TaskGen.feature('javatest')
|
||||||
@TaskGen.after_method('apply_java', 'use_javac_files', 'set_classpath')
|
@TaskGen.after_method('process_source', 'apply_link', 'use_javac_files')
|
||||||
|
def javatest_process_use(self):
|
||||||
|
"""
|
||||||
|
Process the ``use`` attribute which contains a list of task generator names and store
|
||||||
|
paths that later is used to populate the unit test runtime environment.
|
||||||
|
"""
|
||||||
|
self.javatest_use_not = set()
|
||||||
|
self.javatest_use_seen = []
|
||||||
|
self.javatest_libpaths = [] # strings or Nodes
|
||||||
|
self.javatest_pypaths = [] # strings or Nodes
|
||||||
|
self.javatest_dep_nodes = []
|
||||||
|
|
||||||
|
names = self.to_list(getattr(self, 'use', []))
|
||||||
|
for name in names:
|
||||||
|
_process_use_rec(self, name)
|
||||||
|
|
||||||
|
def extend_unique(lst, varlst):
|
||||||
|
ext = []
|
||||||
|
for x in varlst:
|
||||||
|
if x not in lst:
|
||||||
|
ext.append(x)
|
||||||
|
lst.extend(ext)
|
||||||
|
|
||||||
|
# Collect type specific info needed to construct a valid runtime environment
|
||||||
|
# for the test.
|
||||||
|
for name in self.javatest_use_seen:
|
||||||
|
tg = self.bld.get_tgen_by_name(name)
|
||||||
|
|
||||||
|
# Python-Java embedding crosstools such as JEP
|
||||||
|
if 'py' in tg.features:
|
||||||
|
# Python dependencies are added to PYTHONPATH
|
||||||
|
pypath = getattr(tg, 'install_from', tg.path)
|
||||||
|
|
||||||
|
if 'buildcopy' in tg.features:
|
||||||
|
# Since buildcopy is used we assume that PYTHONPATH in build should be used,
|
||||||
|
# not source
|
||||||
|
extend_unique(self.javatest_pypaths, [pypath.get_bld().abspath()])
|
||||||
|
|
||||||
|
# Add buildcopy output nodes to dependencies
|
||||||
|
extend_unique(self.javatest_dep_nodes, [o for task in getattr(tg, 'tasks', []) for o in getattr(task, 'outputs', [])])
|
||||||
|
else:
|
||||||
|
# If buildcopy is not used, depend on sources instead
|
||||||
|
extend_unique(self.javatest_dep_nodes, tg.source)
|
||||||
|
extend_unique(self.javatest_pypaths, [pypath.abspath()])
|
||||||
|
|
||||||
|
|
||||||
|
if getattr(tg, 'link_task', None):
|
||||||
|
# For tasks with a link_task (C, C++, D et.c.) include their library paths:
|
||||||
|
if not isinstance(tg.link_task, ccroot.stlink_task):
|
||||||
|
extend_unique(self.javatest_dep_nodes, tg.link_task.outputs)
|
||||||
|
extend_unique(self.javatest_libpaths, tg.link_task.env.LIBPATH)
|
||||||
|
|
||||||
|
if 'pyext' in tg.features:
|
||||||
|
# If the taskgen is extending Python we also want to add the interpreter libpath.
|
||||||
|
extend_unique(self.javatest_libpaths, tg.link_task.env.LIBPATH_PYEXT)
|
||||||
|
else:
|
||||||
|
# Only add to libpath if the link task is not a Python extension
|
||||||
|
extend_unique(self.javatest_libpaths, [tg.link_task.outputs[0].parent.abspath()])
|
||||||
|
|
||||||
|
|
||||||
|
@TaskGen.feature('javatest')
|
||||||
|
@TaskGen.after_method('apply_java', 'use_javac_files', 'set_classpath', 'javatest_process_use')
|
||||||
def make_javatest(self):
|
def make_javatest(self):
|
||||||
"""
|
"""
|
||||||
Creates a ``utest`` task with a populated environment for Java Unit test execution
|
Creates a ``utest`` task with a populated environment for Java Unit test execution
|
||||||
|
@ -65,6 +150,9 @@ def make_javatest(self):
|
||||||
tsk = self.create_task('utest')
|
tsk = self.create_task('utest')
|
||||||
tsk.set_run_after(self.javac_task)
|
tsk.set_run_after(self.javac_task)
|
||||||
|
|
||||||
|
# Dependencies from recursive use analysis
|
||||||
|
tsk.dep_nodes.extend(self.javatest_dep_nodes)
|
||||||
|
|
||||||
# Put test input files as waf_unit_test relies on that for some prints and log generation
|
# Put test input files as waf_unit_test relies on that for some prints and log generation
|
||||||
# If jtest_source is there, this is specially useful for passing XML for TestNG
|
# If jtest_source is there, this is specially useful for passing XML for TestNG
|
||||||
# that contain test specification, use that as inputs, otherwise test sources
|
# that contain test specification, use that as inputs, otherwise test sources
|
||||||
|
@ -97,6 +185,21 @@ def make_javatest(self):
|
||||||
|
|
||||||
if not hasattr(self, 'ut_env'):
|
if not hasattr(self, 'ut_env'):
|
||||||
self.ut_env = dict(os.environ)
|
self.ut_env = dict(os.environ)
|
||||||
|
def add_paths(var, lst):
|
||||||
|
# Add list of paths to a variable, lst can contain strings or nodes
|
||||||
|
lst = [ str(n) for n in lst ]
|
||||||
|
Logs.debug("ut: %s: Adding paths %s=%s", self, var, lst)
|
||||||
|
self.ut_env[var] = os.pathsep.join(lst) + os.pathsep + self.ut_env.get(var, '')
|
||||||
|
|
||||||
|
add_paths('PYTHONPATH', self.javatest_pypaths)
|
||||||
|
|
||||||
|
if Utils.is_win32:
|
||||||
|
add_paths('PATH', self.javatest_libpaths)
|
||||||
|
elif Utils.unversioned_sys_platform() == 'darwin':
|
||||||
|
add_paths('DYLD_LIBRARY_PATH', self.javatest_libpaths)
|
||||||
|
add_paths('LD_LIBRARY_PATH', self.javatest_libpaths)
|
||||||
|
else:
|
||||||
|
add_paths('LD_LIBRARY_PATH', self.javatest_libpaths)
|
||||||
|
|
||||||
def configure(ctx):
|
def configure(ctx):
|
||||||
cp = ctx.env.CLASSPATH or '.'
|
cp = ctx.env.CLASSPATH or '.'
|
||||||
|
|
Loading…
Reference in New Issue