diff options
| author | Chris Johns <chrisj@rtems.org> | 2020-09-30 15:31:23 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2020-09-30 15:31:23 +1000 |
| commit | d164b840c3973e0793da1b3e4142b1711514b9ba (patch) | |
| tree | 6268bbaef91f396af64809d61ab8733190df1154 /builder.py | |
| parent | Update the CONTRIBUTING with kernel/user space notes. (diff) | |
| download | rtems-libbsd-d164b840c3973e0793da1b3e4142b1711514b9ba.tar.bz2 | |
waf: Fix test module dependency check
Diffstat (limited to 'builder.py')
| -rwxr-xr-x | builder.py | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -608,13 +608,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 @@ -625,7 +627,8 @@ class TestFragementComposer(BuildSystemComposer): 'files': self.fileFragments, 'run': self.runTest, 'net': self.netTest, - 'libs': self.extraLibs + 'libs': self.extraLibs, + 'modules': self.modules, } @@ -636,7 +639,8 @@ class TestIfHeaderComposer(TestFragementComposer): fileFragments, runTest=True, netTest=False, - extraLibs=[]): + extraLibs=[], + modules=[]): if headers is not list: headers = [headers] self.headers = headers @@ -645,7 +649,8 @@ class TestIfHeaderComposer(TestFragementComposer): 'header', runTest=runTest, netTest=netTest, - extraLibs=extraLibs) + extraLibs=extraLibs, + modules=modules) def compose(self, path): r = TestFragementComposer.compose(self, path) @@ -660,7 +665,8 @@ class TestIfLibraryComposer(TestFragementComposer): fileFragments, runTest=True, netTest=False, - extraLibs=[]): + extraLibs=[], + modules=[]): if libraries is not list: libraries = [libraries] self.libraries = libraries @@ -669,7 +675,8 @@ class TestIfLibraryComposer(TestFragementComposer): 'library', runTest=runTest, netTest=netTest, - extraLibs=extraLibs) + extraLibs=extraLibs, + modules=modules) def compose(self, path): r = TestFragementComposer.compose(self, path) @@ -990,12 +997,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): |