F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 1206 - Test libraries are built but test suites are not being run in test.py

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2011-07-05 11:05:53 +01:00
parent 681bd950be
commit e6e9991d4f
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/wscript
View File

@@ -10,7 +10,7 @@ def build(bld):
# Set the libraries the testrunner depends on equal to the list of
# enabled modules plus the list of enabled module test libraries.
test_runner.uselib_local = env['NS3_ENABLED_MODULES'] + env['NS3_ENABLED_MODULE_TEST_LIBRARIES']
test_runner.uselib_local = [mod+"--lib" for mod in (env['NS3_ENABLED_MODULES'] + env['NS3_ENABLED_MODULE_TEST_LIBRARIES'])]
obj = bld.create_ns3_program('bench-simulator', ['core'])
obj.source = 'bench-simulator.cc'

11
wscript
View File

@@ -610,7 +610,7 @@ def add_scratch_programs(bld):
def _add_ns3_program_missing_deps(bld, program):
deps_found = program.ns3_module_dependencies
program.uselib_local = [dep + "--lib" for dep in deps_found]
program.uselib_local = getattr(program, "uselib_local", []) + [dep + "--lib" for dep in deps_found]
if program.env['ENABLE_STATIC_NS3'] and not program.env['ENABLE_SHARED_AND_STATIC_NS3']:
if sys.platform == 'darwin':
program.env.append_value('LINKFLAGS', '-Wl,-all_load')
@@ -690,10 +690,6 @@ def build(bld):
if mod in bld.env['NS3_ENABLED_MODULES']:
bld.env.append_value('NS3_ENABLED_MODULE_TEST_LIBRARIES', testlib)
# Process this subfolder here after the lists of enabled modules
# and module test libraries have been set.
bld.add_subdirs('utils')
add_examples_programs(bld)
add_scratch_programs(bld)
@@ -789,12 +785,15 @@ def build(bld):
for lib in gen.libs:
lib.post()
# Process this subfolder here after the lists of enabled modules
# and module test libraries have been set.
bld.add_subdirs('utils')
for gen in bld.all_task_gen:
if not getattr(gen, "is_ns3_program", False) or not hasattr(gen, "ns3_module_dependencies"):
continue
_add_ns3_program_missing_deps(bld, gen)
if Options.options.run:
# Check that the requested program name is valid
program_name, dummy_program_argv = wutils.get_run_program(Options.options.run, wutils.get_command_template(env))