From 06cce95b55cb6e741b472acf49d84da548978149 Mon Sep 17 00:00:00 2001 From: Brian Daniels Date: Thu, 8 Nov 2018 15:06:35 -0600 Subject: [PATCH] Fixing the recursive feature conflict config test --- .../FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json | 2 +- .../FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json | 8 -------- .../FEATURE_STORAGE/lib2/mbed_lib.json | 2 +- .../test/config/fetaure_recursive_conflict/mbed_app.json | 2 +- .../test/config/fetaure_recursive_conflict/test_data.json | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json index 4ba03096c9..ed2f3e9acf 100644 --- a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json +++ b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_BOOTLOADER/lib1/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib1", "target_overrides": { "*": { - "target.features_add": ["STORAGE"] + "target.features_remove": ["STORAGE"] } } } diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json deleted file mode 100644 index 4ba03096c9..0000000000 --- a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "lib1", - "target_overrides": { - "*": { - "target.features_add": ["STORAGE"] - } - } -} diff --git a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json index 73b57765aa..fb6d454127 100644 --- a/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json +++ b/tools/test/config/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json @@ -2,7 +2,7 @@ "name": "lib2", "target_overrides": { "*": { - "target.features_add": ["UVISOR"] + "target.features_add": ["BOOTLOADER"] } } } diff --git a/tools/test/config/fetaure_recursive_conflict/mbed_app.json b/tools/test/config/fetaure_recursive_conflict/mbed_app.json index b4ad5832fb..9509bfecb9 100644 --- a/tools/test/config/fetaure_recursive_conflict/mbed_app.json +++ b/tools/test/config/fetaure_recursive_conflict/mbed_app.json @@ -1,7 +1,7 @@ { "target_overrides": { "*": { - "target.features": ["IPV4", "STORAGE"] + "target.features_add": ["STORAGE"] } } } diff --git a/tools/test/config/fetaure_recursive_conflict/test_data.json b/tools/test/config/fetaure_recursive_conflict/test_data.json index b31573bcba..ae129d28b6 100644 --- a/tools/test/config/fetaure_recursive_conflict/test_data.json +++ b/tools/test/config/fetaure_recursive_conflict/test_data.json @@ -1,5 +1,5 @@ { "K64F": { - "exception_msg": "Configuration conflict. The feature UVISOR both added and removed." + "exception_msg": "Configuration conflict. The feature STORAGE both added and removed." } }