waf: Implement module dependency checking in the build system

- Do not build a test if a dependency is not enabled.

- Perform a dependency check and generate an error if an enabled module
  depends on a disabled module.

Closes #4077

1 files changed, 14 insertions, 15 deletions

diff --git a/libbsd.py b/libbsd.py
index 5b7e8a88..17ed6a49 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -829,7 +829,7 @@ class dev_usb_controller(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/controller/ohci.h',
@@ -868,7 +868,7 @@ class dev_usb_input(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/input/usb_rdesc.h',
@@ -896,7 +896,7 @@ class dev_usb_net(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/net/if_auereg.h',
@@ -946,7 +946,7 @@ class dev_usb_quirk(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/quirk/usb_quirk.h',
@@ -969,7 +969,7 @@ class dev_usb_serial(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/serial/uftdi_reg.h',
@@ -1014,7 +1014,7 @@ class dev_usb_storage(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceSourceFiles(
             [
                 'sys/dev/usb/storage/umass.c',
@@ -1032,7 +1032,7 @@ class dev_usb_controller_bbb(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/arm/ti/ti_cpuid.h',
@@ -1069,7 +1069,7 @@ class dev_usb_wlan(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/usb/wlan/if_rsureg.h',
@@ -1119,7 +1119,7 @@ class dev_wlan_rtwn(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['dev_usb'])
+        self.addDependency('dev_usb')
         self.addKernelSpaceHeaderFiles(
             [
                 'sys/dev/rtwn/if_rtwn_beacon.h',
@@ -2738,7 +2738,7 @@ class nfsv2(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['rpc_user'])
+        self.addDependency('rpc_user')
         self.addRTEMSUserSourceFiles(
             [
                 'nfsclient/mount_prot_xdr.c',
@@ -3131,7 +3131,7 @@ class crypto_openssl(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['user_space'])
+        self.addDependency('user_space')
         self.addUserSpaceHeaderFiles(
             [
                 'crypto/openssl/crypto/aes/aes_locl.h',
@@ -4108,7 +4108,7 @@ class usr_bin_openssl(builder.Module):
 
     def generate(self):
         mm = self.manager
-        self.addDependency(mm['crypto_openssl'])
+        self.addDependency('crypto_openssl')
         self.addUserSpaceHeaderFiles(
             [
                 'crypto/openssl/apps/apps.h',
@@ -5161,7 +5161,8 @@ class tests(builder.Module):
     def generate(self):
         mm = self.manager
         self.addTest(mm.generator['test']('epoch01', ['test_main'], extraLibs = ['rtemstest']))
-        self.addTest(mm.generator['test']('nfs01', ['test_main'], netTest = True))
+        self.addTest(mm.generator['test']('nfs01', ['test_main'], netTest = True),
+                     ['nfsv2'])
         self.addTest(mm.generator['test']('foobarclient', ['test_main'],
                                           runTest = False, netTest = True))
         self.addTest(mm.generator['test']('foobarserver', ['test_main'],
@@ -5328,7 +5329,5 @@ def load(mm):
 
     mm.addModule(tests(mm))
 
-    mm.setModuleConfigiuration()
-
     # XXX TODO Check that no file is also listed in empty
     # XXX TODO Check that no file in in two modules