rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-17 19:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

waf: Fix test module dependency check

Browse Source
This commit is contained in:
Chris Johns
2020-09-30 15:31:23 +10:00
parent a0556e196a
commit 7027254d29
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
builder.py
View File

@@ -605,13 +605,15 @@ class TestFragementComposer(BuildSystemComposer):
configTest=None,
runTest=True,
netTest=False,
extraLibs=[]):
extraLibs=[],
modules=[]):
self.testName = testName
self.fileFragments = fileFragments
self.configTest = configTest
self.runTest = runTest
self.netTest = netTest
self.extraLibs = extraLibs
self.modules = modules
def __str__(self):
return 'TEST: ' + self.testName
@@ -622,7 +624,8 @@ class TestFragementComposer(BuildSystemComposer):
'files': self.fileFragments,
'run': self.runTest,
'net': self.netTest,
'libs': self.extraLibs
'libs': self.extraLibs,
'modules': self.modules,
}
@@ -633,7 +636,8 @@ class TestIfHeaderComposer(TestFragementComposer):
fileFragments,
runTest=True,
netTest=False,
extraLibs=[]):
extraLibs=[],
modules=[]):
if headers is not list:
headers = [headers]
self.headers = headers
@@ -642,7 +646,8 @@ class TestIfHeaderComposer(TestFragementComposer):
'header',
runTest=runTest,
netTest=netTest,
extraLibs=extraLibs)
extraLibs=extraLibs,
modules=modules)
def compose(self, path):
r = TestFragementComposer.compose(self, path)
@@ -657,7 +662,8 @@ class TestIfLibraryComposer(TestFragementComposer):
fileFragments,
runTest=True,
netTest=False,
extraLibs=[]):
extraLibs=[],
modules=[]):
if libraries is not list:
libraries = [libraries]
self.libraries = libraries
@@ -666,7 +672,8 @@ class TestIfLibraryComposer(TestFragementComposer):
'library',
runTest=runTest,
netTest=netTest,
extraLibs=extraLibs)
extraLibs=extraLibs,
modules=modules)
def compose(self, path):
r = TestFragementComposer.compose(self, path)
@@ -987,12 +994,11 @@ class Module(object):
NoConverter(), assertSourceFile,
sourceFileBuildComposer)
def addTest(self, testFragementComposer, dependencies=[]):
def addTest(self, testFragementComposer):
self.files += [
File('user', testFragementComposer.testName, PathComposer(),
NoConverter(), NoConverter(), testFragementComposer)
]
self.dependencies += dependencies
def addDependency(self, dep):
if not isinstance(dep, str):