Merge pull request #2281 from geky/tools-ca-set-arith-fix

[tools] Fix precedence issue in cumulative attribute set-arithmetic

Author: bogdanm

tools/config.py

@@ -169,7 +169,8 @@ def strict_cumulative_overrides(self, overrides):
 
     def update_target(self, target):
         setattr(target, self.name, list(
-                set(getattr(target, self.name, [])) | self.additions - self.removals))
+                (set(getattr(target, self.name, [])) | self.additions) - self.removals))
+
 
 
 # 'Config' implements the mbed configuration mechanism

tools/test/config_test/test27/lib1/mbed_lib.json

@@ -0,0 +1,8 @@
+{
+    "name": "lib1",
+    "target_overrides": {
+        "*": {
+            "target.features_remove": ["IPV4"]
+        }
+    }
+}

tools/test/config_test/test27/mbed_app.json

@@ -0,0 +1,11 @@
+{
+    "custom_targets": {
+        "test_target": {
+            "core": "Cortex-M0",
+            "extra_labels": [],
+            "features": ["IPV4"],
+            "default_build": "standard"
+        }
+    }
+}
+

tools/test/config_test/test27/test_data.py

@@ -0,0 +1,8 @@
+# Testing when adding two features
+
+expected_results = {
+    "test_target": {
+        "desc": "test removing features",
+        "expected_features": []
+    }
+}