waf: Allow to add libs per test.

Update #3419.
This commit is contained in:
Christian Mauderer
2018-05-02 11:25:18 +02:00
parent a779a3b870
commit dd35ec5cd7
3 changed files with 33 additions and 15 deletions

View File

@@ -496,25 +496,28 @@ class SourceFileIfHeaderComposer(SourceFileFragmentComposer):
class TestFragementComposer(BuildSystemFragmentComposer):
def __init__(self, testName, fileFragments, runTest = True, netTest = False):
def __init__(self, testName, fileFragments, runTest = True, netTest = False, extraLibs = []):
self.testName = testName
self.fileFragments = fileFragments
self.runTest = runTest
self.netTest = netTest
self.extraLibs = extraLibs
def compose(self, path):
return ['tests', self.testName, ('default', None)], { 'files': self.fileFragments,
'run': self.runTest,
'net': self.netTest }
'net': self.netTest,
'libs': self.extraLibs}
class TestIfHeaderComposer(TestFragementComposer):
def __init__(self, testName, headers, fileFragments, runTest = True, netTest = False):
def __init__(self, testName, headers, fileFragments, runTest = True, netTest = False, extraLibs = []):
if headers is not list:
headers = [headers]
self.headers = headers
super(TestIfHeaderComposer, self).__init__(testName, fileFragments,
runTest = runTest, netTest = netTest)
runTest = runTest, netTest = netTest,
extraLibs = extraLibs)
def compose(self, path):
r = TestFragementComposer.compose(self, path)