From d164b840c3973e0793da1b3e4142b1711514b9ba Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Wed, 30 Sep 2020 15:31:23 +1000
Subject: waf: Fix test module dependency check

---
 waf_libbsd.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'waf_libbsd.py')

diff --git a/waf_libbsd.py b/waf_libbsd.py
index 17cab509..070d3eac 100644
--- a/waf_libbsd.py
+++ b/waf_libbsd.py
@@ -561,13 +561,18 @@ class Builder(builder.ModuleManager):
         tests = []
         if 'tests' in self.data:
             tests = self.data['tests']['user']
+        enabled_modules = self.getEnabledModules()
         for testName in sorted(tests):
             test = tests[testName]['all']
             test_source = []
             libs = ['bsd', 'm', 'z', 'rtemstest']
             for cfg in test:
                 build_test = True
-                if cfg != 'default':
+                for mod in test[cfg]['modules']:
+                    if mod not in enabled_modules:
+                        build_test = False
+                        break
+                if build_test and cfg != 'default':
                     for c in cfg.split(' '):
                         if not bld.env['HAVE_%s' % (c)]:
                             build_test = False
-- 
cgit v1.2.3