Add range specifers for config values

Author: kegilbert

tools/config/__init__.py

@@ -101,15 +101,19 @@ def __init__(self, name, data, unit_name, unit_kind):
         data - the data associated with the configuration parameter
         unit_name - the unit (target/library/application) that defines this
                     parameter
-        unit_ kind - the kind of the unit ("target", "library" or "application")
+        unit_kind - the kind of the unit ("target", "library" or "application")
         """
+
         self.name = self.get_full_name(name, unit_name, unit_kind,
                                        allow_prefix=False)
         self.defined_by = self.get_display_name(unit_name, unit_kind)
         self.set_value(data.get("value", None), unit_name, unit_kind)
-        self.help_text = data.get("help", None)
-        self.required = data.get("required", False)
-        self.macro_name = data.get("macro_name", "MBED_CONF_%s" %
+        self.value_min       = data.get("value_min")
+        self.value_max       = data.get("value_max")
+        self.accepted_values = data.get("accepted_values")
+        self.help_text       = data.get("help", None)
+        self.required        = data.get("required", False)
+        self.macro_name      = data.get("macro_name", "MBED_CONF_%s" %
                                    self.sanitize(self.name.upper()))
         self.config_errors = []
 
@@ -749,7 +753,7 @@ def _generate_bootloader_build(self, rom_start, rom_size):
         if start > rom_start + rom_size:
             raise ConfigException("Not enough memory on device to fit all "
                                   "application regions")
-    
+
     @staticmethod
     def _find_sector(address, sectors):
         target_size = -1
@@ -762,13 +766,13 @@ def _find_sector(address, sectors):
         if (target_size < 0):
             raise ConfigException("No valid sector found")
         return target_start, target_size
-        
+
     @staticmethod
     def _align_floor(address, sectors):
         target_start, target_size = Config._find_sector(address, sectors)
         sector_num = (address - target_start) // target_size
         return target_start + (sector_num * target_size)
-    
+
     @staticmethod
     def _align_ceiling(address, sectors):
         target_start, target_size = Config._find_sector(address, sectors)
@@ -1058,9 +1062,31 @@ def validate_config(self):
 
         Arguments: None
         """
+
         params, _ = self.get_config_data()
+        err_msg = ""
+
+        for name, param in sorted(params.items()):
+            min      = param.value_min
+            max      = param.value_max
+            accepted = param.accepted_values
+            value    = param.value
+
+            if (value < min or (value > max if max is not None else False)):
+                err_msg += "\nInvalid config range for %s, is not in the required range: [%s:%s]"\
+                                % (param, 
+                                   min if min is not None else "-inf", 
+                                   max if max is not None else "inf")
+
+            if accepted and value not in accepted:
+                err_msg += "\nInvalid config range for %s, is not an accepted value: %s"\
+                                % (param, accepted)
+
+        if (err_msg):
+            raise ConfigException(err_msg)
+
         for error in self.config_errors:
-            if  (isinstance(error, UndefinedParameter) and
+            if (isinstance(error, UndefinedParameter) and
                  error.param in params):
                 continue
             else:

tools/test/config/range_limits/lib1/mbed_lib.json

@@ -0,0 +1,26 @@
+{
+    "name": "lib1",
+    "config": {
+        "config1": {
+            "help": "The default value should pass as it is in the list of accepted values",
+            "value": 5,
+            "accepted_values": [0, 5, 10]
+        },
+        "config2": {
+            "help": "The default value should pass as it is in the rage of accepted values",
+            "value": 7,
+            "value_min": 0,
+            "value_max": 10
+        },
+        "config3": {
+            "help": "The default value should pass as it is in the rage of accepted values",
+            "value": "foo",
+            "accepted_values": ["foo", "bar"]
+        },
+        "config4": {
+            "help": "The default value should pass as it is in the rage of accepted values",
+            "value": false,
+            "accepted_values": [true, false]
+        }
+    }
+}

tools/test/config/range_limits/targets.json

@@ -0,0 +1,9 @@
+{
+    "test_target": {
+        "core": "Cortex-M0",
+        "extra_labels": [],
+        "features": [],
+        "default_lib": "std",
+        "supported_toolchains": ["GCC_ARM"]
+    }
+}

tools/test/config/range_limits/test_data.json

@@ -0,0 +1,8 @@
+{
+    "test_target": {
+        "lib1.config1": 5,
+        "lib1.config2": 7,
+        "lib1.config3": "foo",
+        "lib1.config4": false
+    }
+}

tools/test/config/range_limits_invalid/lib1/mbed_lib.json

@@ -0,0 +1,26 @@
+{
+    "name": "lib1",
+    "config": {
+        "config1": {
+            "help": "The default value should fail as it is not in the rage of accepted values",
+            "value": 99,
+            "accepted_values": [0, 5, 10]
+        },
+        "config2": {
+            "help": "The default value should fail as it is not in the rage of accepted values",
+            "value": 100,
+            "value_min": 0,
+            "value_max": 10
+        },
+        "config3": {
+            "help": "The default value should fail as it is not in the rage of accepted values",
+            "value": 101,
+            "value_min": 102
+        },
+        "config4": {
+            "help": "The default value should fail as it is not in the rage of accepted values",
+            "value": 102,
+            "value_max": 101
+        }
+    }
+}

tools/test/config/range_limits_invalid/targets.json

@@ -0,0 +1,9 @@
+{
+    "test_target": {
+        "core": "Cortex-M0",
+        "extra_labels": [],
+        "features": [],
+        "default_lib": "std",
+        "supported_toolchains": ["GCC_ARM"]
+    }
+}

tools/test/config/range_limits_invalid/test_data.json

@@ -0,0 +1,5 @@
+{
+    "test_target": {
+        "exception_msg": "\nInvalid config range for lib1.config1 = 99 (macro name: \"MBED_CONF_LIB1_CONFIG1\"), is not an accepted value: [0, 5, 10]\nInvalid config range for lib1.config2 = 100 (macro name: \"MBED_CONF_LIB1_CONFIG2\"), is not in the required range: [0:10]\nInvalid config range for lib1.config3 = 101 (macro name: \"MBED_CONF_LIB1_CONFIG3\"), is not in the required range: [102:inf]\nInvalid config range for lib1.config4 = 102 (macro name: \"MBED_CONF_LIB1_CONFIG4\"), is not in the required range: [-inf:101]"
+    }
+}

tools/test/config/range_limits_override_invalid/lib1/mbed_lib.json

@@ -0,0 +1,11 @@
+{
+    "name": "lib1",
+    "config": {
+        "config1": {
+            "help": "The default value should pass, but will be overridden out of bounds and should error",
+            "value": 8,
+            "value_min": 0,
+            "value_max": 10
+        }
+    }
+}

tools/test/config/range_limits_override_invalid/mbed_app.json

@@ -0,0 +1,7 @@
+{
+    "target_overrides": {
+        "test_target": {
+            "lib1.config1": 12
+        }
+    }
+}

tools/test/config/range_limits_override_invalid/targets.json

@@ -0,0 +1,9 @@
+{
+    "test_target": {
+        "core": "Cortex-M0",
+        "extra_labels": [],
+        "features": [],
+        "default_lib": "std",
+        "supported_toolchains": ["GCC_ARM"]
+    }
+}

tools/test/config/range_limits_override_invalid/test_data.json

@@ -0,0 +1,6 @@
+{
+    "test_target": {
+        "lib1.config1": 8,
+        "exception_msg": "Invalid config range for lib1.config1 = 12 (macro name: \"MBED_CONF_LIB1_CONFIG1\"), is not in the required range: [0:10]"
+    }
+}