Config parameters override macros

Author: bridadan

tools/config/__init__.py

@@ -1081,8 +1081,8 @@ def _check_required_parameters(params):
     def _parameters_and_config_macros_to_macros(params, macros):
         """ Return the macro definitions generated for a dictionary of
         ConfigParameters and a dictionary of ConfigMacros (as returned by
-        get_config_data). The ConfigMacros override any matching macros set by
-        the ConfigParameters.
+        get_config_data). The ConfigParameters override any matching macros set
+        by the ConfigMacros.
 
         Positional arguments:
         params - a dictionary mapping a name to a ConfigParameter
@@ -1091,14 +1091,14 @@ def _parameters_and_config_macros_to_macros(params, macros):
         Return: a list of strings that are the C pre-processor macros
         """
         all_macros = {
-            p.macro_name: p.value for p in params.values() if p.value is not None
+            m.macro_name: m.macro_value for m in macros.values()
         }
 
-        config_macros = {
-            m.macro_name: m.macro_value for m in macros.values()
+        parameter_macros = {
+            p.macro_name: p.value for p in params.values() if p.value is not None
         }
 
-        all_macros.update(config_macros)
+        all_macros.update(parameter_macros)
         macro_list = []
         for name, value in all_macros.items():
             # If the macro does not have a value, just append the name.

tools/test/config/config_test.py

@@ -199,8 +199,7 @@ def test_basic_regions(target, overrides):
 
 def test_parameters_and_config_macros_to_macros():
     """
-    Test that checks that parameter-generated macros get overriden with
-    explicitly set macros
+    Test that checks that parameter-generated macros override set macros
     """
 
     params = {
@@ -224,4 +223,4 @@ def test_parameters_and_config_macros_to_macros():
     }
 
     macro_list = Config._parameters_and_config_macros_to_macros(params, macros)
-    assert macro_list == ["CUSTOM_MACRO_NAME=2"]
+    assert macro_list == ["CUSTOM_MACRO_NAME=1"]