From 177fb7933d91d616218cefb34f534702cfe5a81b Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Mon, 28 Aug 2017 12:06:15 -0500 Subject: [PATCH] Rework config_test to use py.test --- .travis.yml | 3 +- .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../app_override_libs/test_data.json | 10 ++ .../mbed_app.json | 0 .../bootloader_missing/test_data.json | 5 + .../targets.json | 0 .../test_data.json} | 10 +- tools/test/config_test/config_test.py | 108 ++++++------------ .../{test04 => double_define}/targets.json | 0 .../config_test/double_define/test_data.json | 12 ++ .../lib1/mbed_lib.json | 0 .../lib2/mbed_lib.json | 0 .../duplicate_lib_name/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../feature_compesition/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../test_data.json} | 4 +- .../FEATURE_IPV4/lib1/mbed_lib.json | 0 .../FEATURE_STORAGE/lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../feature_recursive_add/test_data.json | 6 + .../FEATURE_IPV4/lib1/mbed_lib.json | 0 .../FEATURE_STORAGE/lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../feature_recursive_complex/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../{test27 => feature_remove}/targets.json | 0 .../config_test/feature_remove/test_data.json | 6 + .../{test28 => feature_uvisor}/mbed_app.json | 0 .../{test24 => feature_uvisor}/targets.json | 0 .../config_test/feature_uvisor/test_data.json | 6 + .../FEATURE_IPV4/lib1/mbed_lib.json | 0 .../FEATURE_STORAGE/lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../fetaure_recursive_conflict/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../invalid_app_macro_define/test_data.json | 6 + .../{test14 => invalid_key}/mbed_app.json | 0 .../config_test/invalid_key/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../invalid_key_lib/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../invalid_lib_macro_define/test_data.json | 6 + .../lib1/mbed_lib.json | 0 .../lib2/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../macro_inheritance/test_data.json | 6 + .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../test_data.json} | 14 +-- .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../test_data.json} | 11 +- .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../test_data.json} | 8 +- .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../test_data.json} | 7 +- .../targets.json | 0 .../test_data.json} | 6 +- .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../mbed_app.json | 0 .../targets.json | 0 .../test_data.json} | 11 +- .../mbed_app.json | 0 .../targets.json | 0 .../override_with_labels/test_data.json | 19 +++ .../lib1/lib2/mbed_lib.json | 0 .../lib1/mbed_lib.json | 0 .../parameter_outside_lib/test_data.json | 6 + .../{test21 => simple_features}/mbed_app.json | 0 .../{test28 => simple_features}/targets.json | 0 .../simple_features/test_data.json | 6 + .../targets.json | 0 .../simple_iheritance/test_data.json | 27 +++++ tools/test/config_test/test01/test_data.py | 46 -------- tools/test/config_test/test04/test_data.py | 18 --- tools/test/config_test/test05/test_data.py | 29 ----- tools/test/config_test/test11/test_data.py | 9 -- tools/test/config_test/test12/test_data.py | 14 --- tools/test/config_test/test13/test_data.py | 8 -- tools/test/config_test/test14/test_data.py | 8 -- tools/test/config_test/test15/test_data.py | 8 -- tools/test/config_test/test16/test_data.py | 12 -- tools/test/config_test/test17/test_data.py | 9 -- tools/test/config_test/test18/test_data.py | 8 -- tools/test/config_test/test19/mbed_app.json | 4 - tools/test/config_test/test19/test_data.py | 8 -- .../config_test/test20/lib1/mbed_lib.json | 5 - tools/test/config_test/test20/test_data.py | 8 -- tools/test/config_test/test21/test_data.py | 8 -- tools/test/config_test/test22/test_data.py | 8 -- tools/test/config_test/test24/test_data.py | 8 -- tools/test/config_test/test25/test_data.py | 8 -- tools/test/config_test/test26/test_data.py | 8 -- tools/test/config_test/test27/test_data.py | 8 -- tools/test/config_test/test28/test_data.py | 8 -- tools/test/config_test/test29/test_data.py | 6 - 122 files changed, 202 insertions(+), 393 deletions(-) rename tools/test/config_test/{test11 => app_override_libs}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test12 => app_override_libs}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test12 => app_override_libs}/mbed_app.json (100%) rename tools/test/config_test/{test12 => app_override_libs}/targets.json (100%) create mode 100644 tools/test/config_test/app_override_libs/test_data.json rename tools/test/config_test/{test29 => bootloader_missing}/mbed_app.json (100%) create mode 100644 tools/test/config_test/bootloader_missing/test_data.json rename tools/test/config_test/{test02 => compound_inheritance}/targets.json (100%) rename tools/test/config_test/{test02/test_data.py => compound_inheritance/test_data.json} (50%) rename tools/test/config_test/{test04 => double_define}/targets.json (100%) create mode 100644 tools/test/config_test/double_define/test_data.json rename tools/test/config_test/{test13 => duplicate_lib_name}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test13 => duplicate_lib_name}/lib2/mbed_lib.json (100%) create mode 100644 tools/test/config_test/duplicate_lib_name/test_data.json rename tools/test/config_test/{test22 => feature_compesition}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test22 => feature_compesition}/mbed_app.json (100%) rename tools/test/config_test/{test16 => feature_compesition}/targets.json (100%) create mode 100644 tools/test/config_test/feature_compesition/test_data.json rename tools/test/config_test/{test23 => feature_conflict}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test23 => feature_conflict}/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test23 => feature_conflict}/mbed_app.json (100%) rename tools/test/config_test/{test23/test_data.py => feature_conflict/test_data.json} (53%) rename tools/test/config_test/{test24 => feature_recursive_add}/FEATURE_IPV4/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test24 => feature_recursive_add}/FEATURE_STORAGE/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test24 => feature_recursive_add}/mbed_app.json (100%) rename tools/test/config_test/{test21 => feature_recursive_add}/targets.json (100%) create mode 100644 tools/test/config_test/feature_recursive_add/test_data.json rename tools/test/config_test/{test25/FEATURE_STORAGE => feature_recursive_complex}/FEATURE_IPV4/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test26 => feature_recursive_complex}/FEATURE_STORAGE/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test26 => feature_recursive_complex}/mbed_app.json (100%) rename tools/test/config_test/{test22 => feature_recursive_complex}/targets.json (100%) create mode 100644 tools/test/config_test/feature_recursive_complex/test_data.json rename tools/test/config_test/{test27 => feature_remove}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test27 => feature_remove}/targets.json (100%) create mode 100644 tools/test/config_test/feature_remove/test_data.json rename tools/test/config_test/{test28 => feature_uvisor}/mbed_app.json (100%) rename tools/test/config_test/{test24 => feature_uvisor}/targets.json (100%) create mode 100644 tools/test/config_test/feature_uvisor/test_data.json rename tools/test/config_test/{test26 => fetaure_recursive_conflict/FEATURE_STORAGE}/FEATURE_IPV4/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test25 => fetaure_recursive_conflict}/FEATURE_STORAGE/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test25 => fetaure_recursive_conflict}/mbed_app.json (100%) create mode 100644 tools/test/config_test/fetaure_recursive_conflict/test_data.json rename tools/test/config_test/{test16 => invalid_app_macro_define}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test16 => invalid_app_macro_define}/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test17 => invalid_app_macro_define}/mbed_app.json (100%) create mode 100644 tools/test/config_test/invalid_app_macro_define/test_data.json rename tools/test/config_test/{test14 => invalid_key}/mbed_app.json (100%) create mode 100644 tools/test/config_test/invalid_key/test_data.json rename tools/test/config_test/{test15 => invalid_key_lib}/lib1/mbed_lib.json (100%) create mode 100644 tools/test/config_test/invalid_key_lib/test_data.json rename tools/test/config_test/{test17 => invalid_lib_macro_define}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test18 => invalid_lib_macro_define}/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test16 => invalid_lib_macro_define}/mbed_app.json (100%) create mode 100644 tools/test/config_test/invalid_lib_macro_define/test_data.json rename tools/test/config_test/{test18 => macro_inheritance}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test17 => macro_inheritance}/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test18 => macro_inheritance}/mbed_app.json (100%) rename tools/test/config_test/{test26 => macro_inheritance}/targets.json (100%) create mode 100644 tools/test/config_test/macro_inheritance/test_data.json rename tools/test/config_test/{test06 => override_labels_libs}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test06 => override_labels_libs}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test06 => override_labels_libs}/mbed_app.json (100%) rename tools/test/config_test/{test05 => override_labels_libs}/targets.json (100%) rename tools/test/config_test/{test06/test_data.py => override_labels_libs/test_data.json} (57%) rename tools/test/config_test/{test07 => override_labels_libs_more}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test07 => override_labels_libs_more}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test07 => override_labels_libs_more}/mbed_app.json (100%) rename tools/test/config_test/{test06 => override_labels_libs_more}/targets.json (100%) rename tools/test/config_test/{test07/test_data.py => override_labels_libs_more/test_data.json} (61%) rename tools/test/config_test/{test08 => override_labels_targets}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test08 => override_labels_targets}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test08 => override_labels_targets}/mbed_app.json (100%) rename tools/test/config_test/{test08 => override_labels_targets}/targets.json (100%) rename tools/test/config_test/{test08/test_data.py => override_labels_targets/test_data.json} (75%) rename tools/test/config_test/{test09 => override_precidence}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test09 => override_precidence}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test10 => override_precidence}/mbed_app.json (100%) rename tools/test/config_test/{test10 => override_precidence}/targets.json (100%) rename tools/test/config_test/{test10/test_data.py => override_precidence/test_data.json} (74%) rename tools/test/config_test/{test03 => override_undefined}/targets.json (100%) rename tools/test/config_test/{test03/test_data.py => override_undefined/test_data.json} (54%) rename tools/test/config_test/{test10 => override_undefined_libs}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test10 => override_undefined_libs}/lib1/mbed_lib.json (100%) rename tools/test/config_test/{test09 => override_undefined_libs}/mbed_app.json (100%) rename tools/test/config_test/{test07 => override_undefined_libs}/targets.json (100%) rename tools/test/config_test/{test09/test_data.py => override_undefined_libs/test_data.json} (57%) rename tools/test/config_test/{test05 => override_with_labels}/mbed_app.json (100%) rename tools/test/config_test/{test09 => override_with_labels}/targets.json (100%) create mode 100644 tools/test/config_test/override_with_labels/test_data.json rename tools/test/config_test/{test12 => parameter_outside_lib}/lib1/lib2/mbed_lib.json (100%) rename tools/test/config_test/{test11 => parameter_outside_lib}/lib1/mbed_lib.json (100%) create mode 100644 tools/test/config_test/parameter_outside_lib/test_data.json rename tools/test/config_test/{test21 => simple_features}/mbed_app.json (100%) rename tools/test/config_test/{test28 => simple_features}/targets.json (100%) create mode 100644 tools/test/config_test/simple_features/test_data.json rename tools/test/config_test/{test01 => simple_iheritance}/targets.json (100%) create mode 100644 tools/test/config_test/simple_iheritance/test_data.json delete mode 100644 tools/test/config_test/test01/test_data.py delete mode 100644 tools/test/config_test/test04/test_data.py delete mode 100644 tools/test/config_test/test05/test_data.py delete mode 100644 tools/test/config_test/test11/test_data.py delete mode 100644 tools/test/config_test/test12/test_data.py delete mode 100644 tools/test/config_test/test13/test_data.py delete mode 100644 tools/test/config_test/test14/test_data.py delete mode 100644 tools/test/config_test/test15/test_data.py delete mode 100644 tools/test/config_test/test16/test_data.py delete mode 100644 tools/test/config_test/test17/test_data.py delete mode 100644 tools/test/config_test/test18/test_data.py delete mode 100644 tools/test/config_test/test19/mbed_app.json delete mode 100644 tools/test/config_test/test19/test_data.py delete mode 100644 tools/test/config_test/test20/lib1/mbed_lib.json delete mode 100644 tools/test/config_test/test20/test_data.py delete mode 100644 tools/test/config_test/test21/test_data.py delete mode 100644 tools/test/config_test/test22/test_data.py delete mode 100644 tools/test/config_test/test24/test_data.py delete mode 100644 tools/test/config_test/test25/test_data.py delete mode 100644 tools/test/config_test/test26/test_data.py delete mode 100644 tools/test/config_test/test27/test_data.py delete mode 100644 tools/test/config_test/test28/test_data.py delete mode 100644 tools/test/config_test/test29/test_data.py diff --git a/.travis.yml b/.travis.yml index 9fc4a14a78..235de670fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,11 +19,10 @@ script: - | find -name "*.s" | tee BUILD/badasm | sed -e "s/^/Bad Assembler file name found: /" && [ ! -s BUILD/badasm ] - make -C events/equeue test clean - - PYTHONPATH=. coverage run tools/test/config_test/config_test.py + - PYTHONPATH=. coverage run -m pytest tools/test/config_test/config_test.py tools/test/toolchains/api.py - PYTHONPATH=. coverage run tools/test/build_api/build_api_test.py - PYTHONPATH=. coverage run tools/test/targets/target_test.py - coverage run tools/test/pylint.py - - coverage run -m pytest tools/test/toolchains/api.py - coverage run tools/test/memap/memap_test.py - coverage run tools/project.py -S - coverage run tools/build_travis.py diff --git a/tools/test/config_test/test11/lib1/lib2/mbed_lib.json b/tools/test/config_test/app_override_libs/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test11/lib1/lib2/mbed_lib.json rename to tools/test/config_test/app_override_libs/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test12/lib1/mbed_lib.json b/tools/test/config_test/app_override_libs/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test12/lib1/mbed_lib.json rename to tools/test/config_test/app_override_libs/lib1/mbed_lib.json diff --git a/tools/test/config_test/test12/mbed_app.json b/tools/test/config_test/app_override_libs/mbed_app.json similarity index 100% rename from tools/test/config_test/test12/mbed_app.json rename to tools/test/config_test/app_override_libs/mbed_app.json diff --git a/tools/test/config_test/test12/targets.json b/tools/test/config_test/app_override_libs/targets.json similarity index 100% rename from tools/test/config_test/test12/targets.json rename to tools/test/config_test/app_override_libs/targets.json diff --git a/tools/test/config_test/app_override_libs/test_data.json b/tools/test/config_test/app_override_libs/test_data.json new file mode 100644 index 0000000000..8820aceeed --- /dev/null +++ b/tools/test/config_test/app_override_libs/test_data.json @@ -0,0 +1,10 @@ + + { + "test_target": { + "lib1.p1": "v_p1_lib1_app", + "lib1.p2": "v_p2_lib1", + "lib1.p3": "v_p3_lib1", + "lib2.p1": "v_p1_lib2_app", + "lib2.p2": "v_p2_lib2" + } +} diff --git a/tools/test/config_test/test29/mbed_app.json b/tools/test/config_test/bootloader_missing/mbed_app.json similarity index 100% rename from tools/test/config_test/test29/mbed_app.json rename to tools/test/config_test/bootloader_missing/mbed_app.json diff --git a/tools/test/config_test/bootloader_missing/test_data.json b/tools/test/config_test/bootloader_missing/test_data.json new file mode 100644 index 0000000000..9fba661299 --- /dev/null +++ b/tools/test/config_test/bootloader_missing/test_data.json @@ -0,0 +1,5 @@ + { + "K64F": { + "exception_msg": "not found" + } +} diff --git a/tools/test/config_test/test02/targets.json b/tools/test/config_test/compound_inheritance/targets.json similarity index 100% rename from tools/test/config_test/test02/targets.json rename to tools/test/config_test/compound_inheritance/targets.json diff --git a/tools/test/config_test/test02/test_data.py b/tools/test/config_test/compound_inheritance/test_data.json similarity index 50% rename from tools/test/config_test/test02/test_data.py rename to tools/test/config_test/compound_inheritance/test_data.json index b915a17ed4..fc4806fb07 100644 --- a/tools/test/config_test/test02/test_data.py +++ b/tools/test/config_test/compound_inheritance/test_data.json @@ -1,13 +1,6 @@ -# This is similar to test1, but this time B2 also inherits from B1, which allows it to override its config data. -# B2 also overrides base1_2, like D1. -# The order of inheritace in F is also reversed ([D1, B2] instead of [B2, D1]) -# Since the last override of base1_2 in inheritance order is in B2, base1_2 must now -# have the value that was overriden in B2, not in D1. -# This test also shows that multiple inheritance works for a simple diamond shaped inheritance pattern -expected_results = { + { "f": { - "desc": "test multiple target inheritance (diamond shape)", "target.base1_1": "v_base1_1_f", "target.base1_2": "v_base1_2_b2", "target.base1_3": "v_base1_3_b1", @@ -19,7 +12,6 @@ expected_results = { "target.f1_2": "v_f1_2_f" }, "b2": { - "desc": "another single inheritance test", "target.base1_1": "v_base1_1_b1", "target.base1_2": "v_base1_2_b2", "target.base1_3": "v_base1_3_b1", diff --git a/tools/test/config_test/config_test.py b/tools/test/config_test/config_test.py index ac7d1d1a7e..86cb71eb4b 100644 --- a/tools/test/config_test/config_test.py +++ b/tools/test/config_test/config_test.py @@ -15,10 +15,14 @@ See the License for the specific language governing permissions and limitations under the License. """ +import os +import sys +import json +import pytest +from os.path import join, isfile, dirname, abspath from tools.build_api import get_config from tools.targets import set_targets_json_location, Target from tools.config import ConfigException, Config -import os, sys # Compare the output of config against a dictionary of known good results def compare_config(cfg, expected): @@ -27,87 +31,43 @@ def compare_config(cfg, expected): if cfg[k].value != expected[k]: return "'%s': expected '%s', got '%s'" % (k, expected[k], cfg[k].value) except KeyError: - raise return "Unexpected key '%s' in configuration data" % k for k in expected: - if k not in ["desc", "expected_macros", "expected_features"] + cfg.keys(): + if k not in ["expected_macros", "expected_features"] + cfg.keys(): return "Expected key '%s' was not found in configuration data" % k return "" -def test_tree(full_name, name): - failed = 0 - sys.path.append(full_name) - if "test_data" in sys.modules: - del sys.modules["test_data"] - import test_data - # If the test defines custom targets, they must exist in a file called - # "targets.json" in the test's directory. - if os.path.isfile(os.path.join(full_name, "targets.json")): - set_targets_json_location(os.path.join(full_name, "targets.json")) - else: # uset the regular set of targets - set_targets_json_location() - for target, expected in test_data.expected_results.items(): - sys.stdout.write("%s:'%s'(%s) " % (name, expected["desc"], target)) - sys.stdout.flush() - err_msg = None +def data_path(path): + return join(path, "test_data.json") + +def is_test(path): + return isfile(data_path(path)) + +root_dir = abspath(dirname(__file__)) + +@pytest.mark.parametrize("name", filter(lambda d: is_test(join(root_dir, d)), + os.listdir(root_dir))) +def test_config(name): + test_dir = join(root_dir, name) + test_data = json.load(open(data_path(test_dir))) + targets_json = os.path.join(test_dir, "targets.json") + set_targets_json_location(targets_json if isfile(targets_json) else None) + for target, expected in test_data.items(): try: - cfg, macros, features = get_config(full_name, target, "GCC_ARM") - macros = Config.config_macros_to_macros(macros) - except ConfigException as e: - err_msg = e.message - if err_msg: - if expected.has_key("exception_msg"): - if err_msg.find(expected["exception_msg"]) == -1: - print "FAILED!" - sys.stderr.write(" Unexpected error message!\n") - sys.stderr.write(" Expected: '%s'\n" % expected["exception_msg"]) - sys.stderr.write(" Got: '%s'\n" % err_msg) - failed += 1 - else: - print "OK" - else: - print "FAILED!" - sys.stderr.write(" Error while getting configuration!\n") - sys.stderr.write(" " + err_msg + "\n") - failed += 1 - else: + cfg, macros, features = get_config(test_dir, target, "GCC_ARM") res = compare_config(cfg, expected) + assert not(res), res expected_macros = expected.get("expected_macros", None) expected_features = expected.get("expected_features", None) - if res: - print "FAILED!" - sys.stdout.write(" " + res + "\n") - failed += 1 - elif expected_macros is not None: - if sorted(expected_macros) != sorted(macros): - print "FAILED!" - sys.stderr.write(" List of macros doesn't match\n") - sys.stderr.write(" Expected: '%s'\n" % ",".join(sorted(expected_macros))) - sys.stderr.write(" Got: '%s'\n" % ",".join(sorted(expected_macros))) - failed += 1 - else: - print "OK" - elif expected_features is not None: - if sorted(expected_features) != sorted(features): - print "FAILED!" - sys.stderr.write(" List of features doesn't match\n") - sys.stderr.write(" Expected: '%s'\n" % ",".join(sorted(expected_features))) - sys.stderr.write(" Got: '%s'\n" % ",".join(sorted(expected_features))) - failed += 1 - else: - print "OK" + if expected_macros is not None: + macros = Config.config_macros_to_macros(macros) + assert sorted(expected_macros) == sorted(macros) + if expected_features is not None: + assert sorted(expected_features) == sorted(features) + except ConfigException as e: + err_msg = e.message + if "exception_msg" not in expected: + assert not(err_msg), "Unexpected Error: %s" % e else: - print "OK" - sys.path.remove(full_name) - return failed - -failed = 0 -root_dir = os.path.abspath(os.path.dirname(__file__)) -tlist = sorted(os.listdir(root_dir), key = lambda e: int(e[4:]) if e.startswith('test') else -1) -for test_name in tlist: - full_name = os.path.join(root_dir, test_name) - if os.path.isdir(full_name) and test_name.startswith('test'): - failed += test_tree(full_name, test_name) -sys.exit(failed) - + assert expected["exception_msg"] in err_msg diff --git a/tools/test/config_test/test04/targets.json b/tools/test/config_test/double_define/targets.json similarity index 100% rename from tools/test/config_test/test04/targets.json rename to tools/test/config_test/double_define/targets.json diff --git a/tools/test/config_test/double_define/test_data.json b/tools/test/config_test/double_define/test_data.json new file mode 100644 index 0000000000..33e6310c12 --- /dev/null +++ b/tools/test/config_test/double_define/test_data.json @@ -0,0 +1,12 @@ + + { + "f": { + "exception_msg": "Parameter name 'base1_1' defined in both 'target:b2' and 'target:b1'" + }, + "b2": { + "target.base2_1": "v_base2_1_b2", + "target.base2_2": "v_base2_2_b2", + "target.base1_1": "v_base1_1_b2" + } +} + diff --git a/tools/test/config_test/test13/lib1/mbed_lib.json b/tools/test/config_test/duplicate_lib_name/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test13/lib1/mbed_lib.json rename to tools/test/config_test/duplicate_lib_name/lib1/mbed_lib.json diff --git a/tools/test/config_test/test13/lib2/mbed_lib.json b/tools/test/config_test/duplicate_lib_name/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test13/lib2/mbed_lib.json rename to tools/test/config_test/duplicate_lib_name/lib2/mbed_lib.json diff --git a/tools/test/config_test/duplicate_lib_name/test_data.json b/tools/test/config_test/duplicate_lib_name/test_data.json new file mode 100644 index 0000000000..f5891206ac --- /dev/null +++ b/tools/test/config_test/duplicate_lib_name/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Library name 'lib1' is not unique" + } +} diff --git a/tools/test/config_test/test22/lib1/mbed_lib.json b/tools/test/config_test/feature_compesition/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test22/lib1/mbed_lib.json rename to tools/test/config_test/feature_compesition/lib1/mbed_lib.json diff --git a/tools/test/config_test/test22/mbed_app.json b/tools/test/config_test/feature_compesition/mbed_app.json similarity index 100% rename from tools/test/config_test/test22/mbed_app.json rename to tools/test/config_test/feature_compesition/mbed_app.json diff --git a/tools/test/config_test/test16/targets.json b/tools/test/config_test/feature_compesition/targets.json similarity index 100% rename from tools/test/config_test/test16/targets.json rename to tools/test/config_test/feature_compesition/targets.json diff --git a/tools/test/config_test/feature_compesition/test_data.json b/tools/test/config_test/feature_compesition/test_data.json new file mode 100644 index 0000000000..afba703e49 --- /dev/null +++ b/tools/test/config_test/feature_compesition/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_features": ["IPV4", "STORAGE"] + } +} diff --git a/tools/test/config_test/test23/lib1/mbed_lib.json b/tools/test/config_test/feature_conflict/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test23/lib1/mbed_lib.json rename to tools/test/config_test/feature_conflict/lib1/mbed_lib.json diff --git a/tools/test/config_test/test23/lib2/mbed_lib.json b/tools/test/config_test/feature_conflict/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test23/lib2/mbed_lib.json rename to tools/test/config_test/feature_conflict/lib2/mbed_lib.json diff --git a/tools/test/config_test/test23/mbed_app.json b/tools/test/config_test/feature_conflict/mbed_app.json similarity index 100% rename from tools/test/config_test/test23/mbed_app.json rename to tools/test/config_test/feature_conflict/mbed_app.json diff --git a/tools/test/config_test/test23/test_data.py b/tools/test/config_test/feature_conflict/test_data.json similarity index 53% rename from tools/test/config_test/test23/test_data.py rename to tools/test/config_test/feature_conflict/test_data.json index b9ab156acf..b9afa309b1 100644 --- a/tools/test/config_test/test23/test_data.py +++ b/tools/test/config_test/feature_conflict/test_data.json @@ -1,8 +1,6 @@ -# Testing when two features collide -expected_results = { + { "K64F": { - "desc": "test feature collisions", "exception_msg": "Configuration conflict. The feature IPV4 both added and removed." } } diff --git a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/feature_recursive_add/FEATURE_IPV4/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json rename to tools/test/config_test/feature_recursive_add/FEATURE_IPV4/lib1/mbed_lib.json diff --git a/tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/feature_recursive_add/FEATURE_STORAGE/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json rename to tools/test/config_test/feature_recursive_add/FEATURE_STORAGE/lib2/mbed_lib.json diff --git a/tools/test/config_test/test24/mbed_app.json b/tools/test/config_test/feature_recursive_add/mbed_app.json similarity index 100% rename from tools/test/config_test/test24/mbed_app.json rename to tools/test/config_test/feature_recursive_add/mbed_app.json diff --git a/tools/test/config_test/test21/targets.json b/tools/test/config_test/feature_recursive_add/targets.json similarity index 100% rename from tools/test/config_test/test21/targets.json rename to tools/test/config_test/feature_recursive_add/targets.json diff --git a/tools/test/config_test/feature_recursive_add/test_data.json b/tools/test/config_test/feature_recursive_add/test_data.json new file mode 100644 index 0000000000..33f970e7d5 --- /dev/null +++ b/tools/test/config_test/feature_recursive_add/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_features": ["IPV4", "STORAGE", "UVISOR"] + } +} diff --git a/tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/feature_recursive_complex/FEATURE_IPV4/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json rename to tools/test/config_test/feature_recursive_complex/FEATURE_IPV4/lib1/mbed_lib.json diff --git a/tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/feature_recursive_complex/FEATURE_STORAGE/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json rename to tools/test/config_test/feature_recursive_complex/FEATURE_STORAGE/lib2/mbed_lib.json diff --git a/tools/test/config_test/test26/mbed_app.json b/tools/test/config_test/feature_recursive_complex/mbed_app.json similarity index 100% rename from tools/test/config_test/test26/mbed_app.json rename to tools/test/config_test/feature_recursive_complex/mbed_app.json diff --git a/tools/test/config_test/test22/targets.json b/tools/test/config_test/feature_recursive_complex/targets.json similarity index 100% rename from tools/test/config_test/test22/targets.json rename to tools/test/config_test/feature_recursive_complex/targets.json diff --git a/tools/test/config_test/feature_recursive_complex/test_data.json b/tools/test/config_test/feature_recursive_complex/test_data.json new file mode 100644 index 0000000000..e8b27d4bb7 --- /dev/null +++ b/tools/test/config_test/feature_recursive_complex/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "lib2.test": "GOOD" + } +} diff --git a/tools/test/config_test/test27/lib1/mbed_lib.json b/tools/test/config_test/feature_remove/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test27/lib1/mbed_lib.json rename to tools/test/config_test/feature_remove/lib1/mbed_lib.json diff --git a/tools/test/config_test/test27/targets.json b/tools/test/config_test/feature_remove/targets.json similarity index 100% rename from tools/test/config_test/test27/targets.json rename to tools/test/config_test/feature_remove/targets.json diff --git a/tools/test/config_test/feature_remove/test_data.json b/tools/test/config_test/feature_remove/test_data.json new file mode 100644 index 0000000000..e4890962db --- /dev/null +++ b/tools/test/config_test/feature_remove/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_features": [] + } +} diff --git a/tools/test/config_test/test28/mbed_app.json b/tools/test/config_test/feature_uvisor/mbed_app.json similarity index 100% rename from tools/test/config_test/test28/mbed_app.json rename to tools/test/config_test/feature_uvisor/mbed_app.json diff --git a/tools/test/config_test/test24/targets.json b/tools/test/config_test/feature_uvisor/targets.json similarity index 100% rename from tools/test/config_test/test24/targets.json rename to tools/test/config_test/feature_uvisor/targets.json diff --git a/tools/test/config_test/feature_uvisor/test_data.json b/tools/test/config_test/feature_uvisor/test_data.json new file mode 100644 index 0000000000..8a4275d79b --- /dev/null +++ b/tools/test/config_test/feature_uvisor/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_features": ["UVISOR"] + } +} diff --git a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json rename to tools/test/config_test/fetaure_recursive_conflict/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json diff --git a/tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json b/tools/test/config_test/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json rename to tools/test/config_test/fetaure_recursive_conflict/FEATURE_STORAGE/lib2/mbed_lib.json diff --git a/tools/test/config_test/test25/mbed_app.json b/tools/test/config_test/fetaure_recursive_conflict/mbed_app.json similarity index 100% rename from tools/test/config_test/test25/mbed_app.json rename to tools/test/config_test/fetaure_recursive_conflict/mbed_app.json diff --git a/tools/test/config_test/fetaure_recursive_conflict/test_data.json b/tools/test/config_test/fetaure_recursive_conflict/test_data.json new file mode 100644 index 0000000000..57b3f5adfa --- /dev/null +++ b/tools/test/config_test/fetaure_recursive_conflict/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Configuration conflict. The feature UVISOR both added and removed." + } +} diff --git a/tools/test/config_test/test16/lib1/mbed_lib.json b/tools/test/config_test/invalid_app_macro_define/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test16/lib1/mbed_lib.json rename to tools/test/config_test/invalid_app_macro_define/lib1/mbed_lib.json diff --git a/tools/test/config_test/test16/lib2/mbed_lib.json b/tools/test/config_test/invalid_app_macro_define/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test16/lib2/mbed_lib.json rename to tools/test/config_test/invalid_app_macro_define/lib2/mbed_lib.json diff --git a/tools/test/config_test/test17/mbed_app.json b/tools/test/config_test/invalid_app_macro_define/mbed_app.json similarity index 100% rename from tools/test/config_test/test17/mbed_app.json rename to tools/test/config_test/invalid_app_macro_define/mbed_app.json diff --git a/tools/test/config_test/invalid_app_macro_define/test_data.json b/tools/test/config_test/invalid_app_macro_define/test_data.json new file mode 100644 index 0000000000..6c7748c91d --- /dev/null +++ b/tools/test/config_test/invalid_app_macro_define/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Macro 'LIB2_1' defined in both 'library:lib2' and 'application' with incompatible values" + } +} diff --git a/tools/test/config_test/test14/mbed_app.json b/tools/test/config_test/invalid_key/mbed_app.json similarity index 100% rename from tools/test/config_test/test14/mbed_app.json rename to tools/test/config_test/invalid_key/mbed_app.json diff --git a/tools/test/config_test/invalid_key/test_data.json b/tools/test/config_test/invalid_key/test_data.json new file mode 100644 index 0000000000..9c2097d54b --- /dev/null +++ b/tools/test/config_test/invalid_key/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Unknown key(s)" + } +} diff --git a/tools/test/config_test/test15/lib1/mbed_lib.json b/tools/test/config_test/invalid_key_lib/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test15/lib1/mbed_lib.json rename to tools/test/config_test/invalid_key_lib/lib1/mbed_lib.json diff --git a/tools/test/config_test/invalid_key_lib/test_data.json b/tools/test/config_test/invalid_key_lib/test_data.json new file mode 100644 index 0000000000..9c2097d54b --- /dev/null +++ b/tools/test/config_test/invalid_key_lib/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Unknown key(s)" + } +} diff --git a/tools/test/config_test/test17/lib1/mbed_lib.json b/tools/test/config_test/invalid_lib_macro_define/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test17/lib1/mbed_lib.json rename to tools/test/config_test/invalid_lib_macro_define/lib1/mbed_lib.json diff --git a/tools/test/config_test/test18/lib2/mbed_lib.json b/tools/test/config_test/invalid_lib_macro_define/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test18/lib2/mbed_lib.json rename to tools/test/config_test/invalid_lib_macro_define/lib2/mbed_lib.json diff --git a/tools/test/config_test/test16/mbed_app.json b/tools/test/config_test/invalid_lib_macro_define/mbed_app.json similarity index 100% rename from tools/test/config_test/test16/mbed_app.json rename to tools/test/config_test/invalid_lib_macro_define/mbed_app.json diff --git a/tools/test/config_test/invalid_lib_macro_define/test_data.json b/tools/test/config_test/invalid_lib_macro_define/test_data.json new file mode 100644 index 0000000000..fecc9ee386 --- /dev/null +++ b/tools/test/config_test/invalid_lib_macro_define/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "defined in both" + } +} diff --git a/tools/test/config_test/test18/lib1/mbed_lib.json b/tools/test/config_test/macro_inheritance/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test18/lib1/mbed_lib.json rename to tools/test/config_test/macro_inheritance/lib1/mbed_lib.json diff --git a/tools/test/config_test/test17/lib2/mbed_lib.json b/tools/test/config_test/macro_inheritance/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test17/lib2/mbed_lib.json rename to tools/test/config_test/macro_inheritance/lib2/mbed_lib.json diff --git a/tools/test/config_test/test18/mbed_app.json b/tools/test/config_test/macro_inheritance/mbed_app.json similarity index 100% rename from tools/test/config_test/test18/mbed_app.json rename to tools/test/config_test/macro_inheritance/mbed_app.json diff --git a/tools/test/config_test/test26/targets.json b/tools/test/config_test/macro_inheritance/targets.json similarity index 100% rename from tools/test/config_test/test26/targets.json rename to tools/test/config_test/macro_inheritance/targets.json diff --git a/tools/test/config_test/macro_inheritance/test_data.json b/tools/test/config_test/macro_inheritance/test_data.json new file mode 100644 index 0000000000..908c79f43d --- /dev/null +++ b/tools/test/config_test/macro_inheritance/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"] + } +} diff --git a/tools/test/config_test/test06/lib1/lib2/mbed_lib.json b/tools/test/config_test/override_labels_libs/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test06/lib1/lib2/mbed_lib.json rename to tools/test/config_test/override_labels_libs/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test06/lib1/mbed_lib.json b/tools/test/config_test/override_labels_libs/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test06/lib1/mbed_lib.json rename to tools/test/config_test/override_labels_libs/lib1/mbed_lib.json diff --git a/tools/test/config_test/test06/mbed_app.json b/tools/test/config_test/override_labels_libs/mbed_app.json similarity index 100% rename from tools/test/config_test/test06/mbed_app.json rename to tools/test/config_test/override_labels_libs/mbed_app.json diff --git a/tools/test/config_test/test05/targets.json b/tools/test/config_test/override_labels_libs/targets.json similarity index 100% rename from tools/test/config_test/test05/targets.json rename to tools/test/config_test/override_labels_libs/targets.json diff --git a/tools/test/config_test/test06/test_data.py b/tools/test/config_test/override_labels_libs/test_data.json similarity index 57% rename from tools/test/config_test/test06/test_data.py rename to tools/test/config_test/override_labels_libs/test_data.json index 0a91823b40..0efd5e84e5 100644 --- a/tools/test/config_test/test06/test_data.py +++ b/tools/test/config_test/override_labels_libs/test_data.json @@ -1,9 +1,6 @@ -# This build on top of test5 by adding a few libraries with their own configurations -# and overrides. The same targets are used for building and testing (base, b1, b2, both) -expected_results = { + { "base": { - "desc": "override values based on labels with libs (no labels)", "app.app1": "v_app1", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1", @@ -13,7 +10,6 @@ expected_results = { "lib2.p2": "v_p2_lib2" }, "b1": { - "desc": "override values based on labels with libs (first label)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1[b1_label]", @@ -23,7 +19,6 @@ expected_results = { "lib2.p2": "v_p2_lib2[b1_label]" }, "b2": { - "desc": "override values based on labels with libs (second label)", "app.app1": "v_app1", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1", @@ -32,12 +27,7 @@ expected_results = { "lib2.p1": "v_p1_lib2[b2_label]", "lib2.p2": "v_p2_lib2[b2_label]" }, - # The values for lib2.p1 and lib2.p2 illustrate how overriding on multiple - # labels work. In lib2, both lib2.p1 and lib2.p2 are overriden for both - # labels (b1_label and b2_label). However, since "b2_label" is specified - # after "b1_label", it sets the final values of the overrides. "both": { - "desc": "override values based on labels with libs (both labels)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1[b1_label]", @@ -45,5 +35,5 @@ expected_results = { "lib1.p3": "v_p3_lib1", "lib2.p1": "v_p1_lib2[b2_label]", "lib2.p2": "v_p2_lib2[b2_label]" - }, + } } diff --git a/tools/test/config_test/test07/lib1/lib2/mbed_lib.json b/tools/test/config_test/override_labels_libs_more/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test07/lib1/lib2/mbed_lib.json rename to tools/test/config_test/override_labels_libs_more/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test07/lib1/mbed_lib.json b/tools/test/config_test/override_labels_libs_more/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test07/lib1/mbed_lib.json rename to tools/test/config_test/override_labels_libs_more/lib1/mbed_lib.json diff --git a/tools/test/config_test/test07/mbed_app.json b/tools/test/config_test/override_labels_libs_more/mbed_app.json similarity index 100% rename from tools/test/config_test/test07/mbed_app.json rename to tools/test/config_test/override_labels_libs_more/mbed_app.json diff --git a/tools/test/config_test/test06/targets.json b/tools/test/config_test/override_labels_libs_more/targets.json similarity index 100% rename from tools/test/config_test/test06/targets.json rename to tools/test/config_test/override_labels_libs_more/targets.json diff --git a/tools/test/config_test/test07/test_data.py b/tools/test/config_test/override_labels_libs_more/test_data.json similarity index 61% rename from tools/test/config_test/test07/test_data.py rename to tools/test/config_test/override_labels_libs_more/test_data.json index e9d605acfa..40bafefd97 100644 --- a/tools/test/config_test/test07/test_data.py +++ b/tools/test/config_test/override_labels_libs_more/test_data.json @@ -1,8 +1,6 @@ -# This build on top of test6 by adding overrides for libs in the application -expected_results = { + { "base": { - "desc": "override values based on labels with libs (no labels)", "app.app1": "v_app1", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -12,7 +10,6 @@ expected_results = { "lib2.p2": "v_p2_lib2" }, "b1": { - "desc": "override values based on labels with libs (first label)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -22,7 +19,6 @@ expected_results = { "lib2.p2": "v_p2_lib2[b1_label]" }, "b2": { - "desc": "override values based on labels with libs (second label)", "app.app1": "v_app1", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", @@ -31,12 +27,7 @@ expected_results = { "lib2.p1": "v_p1_lib2_app", "lib2.p2": "v_p2_lib2[b2_label]" }, - # The values for lib2.p1 and lib2.p2 illustrate how overriding on multiple - # labels work. In lib2, both lib2.p1 and lib2.p2 are overriden for both - # labels (b1_label and b2_label). However, since "b2_label" is specified - # after "b1_label", it sets the final values of the overrides. "both": { - "desc": "override values based on labels with libs (both labels)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", diff --git a/tools/test/config_test/test08/lib1/lib2/mbed_lib.json b/tools/test/config_test/override_labels_targets/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test08/lib1/lib2/mbed_lib.json rename to tools/test/config_test/override_labels_targets/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test08/lib1/mbed_lib.json b/tools/test/config_test/override_labels_targets/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test08/lib1/mbed_lib.json rename to tools/test/config_test/override_labels_targets/lib1/mbed_lib.json diff --git a/tools/test/config_test/test08/mbed_app.json b/tools/test/config_test/override_labels_targets/mbed_app.json similarity index 100% rename from tools/test/config_test/test08/mbed_app.json rename to tools/test/config_test/override_labels_targets/mbed_app.json diff --git a/tools/test/config_test/test08/targets.json b/tools/test/config_test/override_labels_targets/targets.json similarity index 100% rename from tools/test/config_test/test08/targets.json rename to tools/test/config_test/override_labels_targets/targets.json diff --git a/tools/test/config_test/test08/test_data.py b/tools/test/config_test/override_labels_targets/test_data.json similarity index 75% rename from tools/test/config_test/test08/test_data.py rename to tools/test/config_test/override_labels_targets/test_data.json index 141bf39725..b8a8971ec0 100644 --- a/tools/test/config_test/test08/test_data.py +++ b/tools/test/config_test/override_labels_targets/test_data.json @@ -1,9 +1,6 @@ -# This build on top of test7 by adding some configuration values in targets -# and overriding them in the application -expected_results = { + { "base": { - "desc": "override values based on labels with libs and target params (no labels)", "app.app1": "v_app1", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -16,7 +13,6 @@ expected_results = { "target.par3": "v_par3_base" }, "b1": { - "desc": "override values based on labels with libs and target params (first label)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -29,7 +25,6 @@ expected_results = { "target.par3": "v_par3_base" }, "b2": { - "desc": "override values based on labels with libs and target params (second label)", "app.app1": "v_app1", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", @@ -42,7 +37,6 @@ expected_results = { "target.par3": "v_par3_base" }, "both": { - "desc": "override values based on labels with libs and target params (both labels)", "app.app1": "v_app1[b1_label]", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", diff --git a/tools/test/config_test/test09/lib1/lib2/mbed_lib.json b/tools/test/config_test/override_precidence/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test09/lib1/lib2/mbed_lib.json rename to tools/test/config_test/override_precidence/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test09/lib1/mbed_lib.json b/tools/test/config_test/override_precidence/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test09/lib1/mbed_lib.json rename to tools/test/config_test/override_precidence/lib1/mbed_lib.json diff --git a/tools/test/config_test/test10/mbed_app.json b/tools/test/config_test/override_precidence/mbed_app.json similarity index 100% rename from tools/test/config_test/test10/mbed_app.json rename to tools/test/config_test/override_precidence/mbed_app.json diff --git a/tools/test/config_test/test10/targets.json b/tools/test/config_test/override_precidence/targets.json similarity index 100% rename from tools/test/config_test/test10/targets.json rename to tools/test/config_test/override_precidence/targets.json diff --git a/tools/test/config_test/test10/test_data.py b/tools/test/config_test/override_precidence/test_data.json similarity index 74% rename from tools/test/config_test/test10/test_data.py rename to tools/test/config_test/override_precidence/test_data.json index 7ed62e2ad9..a754e3283c 100644 --- a/tools/test/config_test/test10/test_data.py +++ b/tools/test/config_test/override_precidence/test_data.json @@ -1,8 +1,6 @@ -# This builds on top of test8 by adding target-conditional overrides in mbed_app_config.json. -expected_results = { + { "base": { - "desc": "override values based on labels with libs, target params and target overrides (no labels)", "app.app1": "v_app1", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -15,7 +13,6 @@ expected_results = { "target.par3": "v_par3_base" }, "b1": { - "desc": "override values based on labels with libs, target params and target overrides (first label)", "app.app1": "v_app1[b1_label_label]", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1_app", @@ -28,7 +25,6 @@ expected_results = { "target.par3": "v_par3_base" }, "b2": { - "desc": "override values based on labels with libs, target params and target overrides (second label)", "app.app1": "v_app1", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", @@ -41,7 +37,6 @@ expected_results = { "target.par3": "v_par3_base" }, "both": { - "desc": "override values based on labels with libs, target params and target overrides (both labels)", "app.app1": "v_app1[b1_label_label]", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1_app", diff --git a/tools/test/config_test/test03/targets.json b/tools/test/config_test/override_undefined/targets.json similarity index 100% rename from tools/test/config_test/test03/targets.json rename to tools/test/config_test/override_undefined/targets.json diff --git a/tools/test/config_test/test03/test_data.py b/tools/test/config_test/override_undefined/test_data.json similarity index 54% rename from tools/test/config_test/test03/test_data.py rename to tools/test/config_test/override_undefined/test_data.json index 3540131961..c1faf3c4b2 100644 --- a/tools/test/config_test/test03/test_data.py +++ b/tools/test/config_test/override_undefined/test_data.json @@ -1,13 +1,9 @@ -# Similar to test1, but this time B2 attempt to override base1_1. Since B2 doesn't directly inherit -# from B1, this must raise an error -expected_results = { + { "f": { - "desc": "attempt to override undefined parameter in inherited target", "exception_msg": "Attempt to override undefined parameter 'base1_1' in 'target:b2'" }, "d1": { - "desc": "single target inheritance again", "target.base1_1": "v_base1_1_d1", "target.base1_2": "v_base1_2_d1", "target.base1_3": "v_base1_3_b1", diff --git a/tools/test/config_test/test10/lib1/lib2/mbed_lib.json b/tools/test/config_test/override_undefined_libs/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test10/lib1/lib2/mbed_lib.json rename to tools/test/config_test/override_undefined_libs/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test10/lib1/mbed_lib.json b/tools/test/config_test/override_undefined_libs/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test10/lib1/mbed_lib.json rename to tools/test/config_test/override_undefined_libs/lib1/mbed_lib.json diff --git a/tools/test/config_test/test09/mbed_app.json b/tools/test/config_test/override_undefined_libs/mbed_app.json similarity index 100% rename from tools/test/config_test/test09/mbed_app.json rename to tools/test/config_test/override_undefined_libs/mbed_app.json diff --git a/tools/test/config_test/test07/targets.json b/tools/test/config_test/override_undefined_libs/targets.json similarity index 100% rename from tools/test/config_test/test07/targets.json rename to tools/test/config_test/override_undefined_libs/targets.json diff --git a/tools/test/config_test/test09/test_data.py b/tools/test/config_test/override_undefined_libs/test_data.json similarity index 57% rename from tools/test/config_test/test09/test_data.py rename to tools/test/config_test/override_undefined_libs/test_data.json index 04757485a9..bd49786d6b 100644 --- a/tools/test/config_test/test09/test_data.py +++ b/tools/test/config_test/override_undefined_libs/test_data.json @@ -1,10 +1,6 @@ -# This build on top of test6 by adding an invalid override in mbed_app_override.json for b1_label. -# This will prevent the configuration for working for b1 and both, but it should still -# work for base and b2. -expected_results = { + { "base": { - "desc": "override values based on labels with libs (no labels)", "app.app1": "v_app1", "app.app2": "v_app2", "lib1.p1": "v_p1_lib1", @@ -14,11 +10,9 @@ expected_results = { "lib2.p2": "v_p2_lib2" }, "b1": { - "desc": "override values based on labels with libs - invalid override (first label)", "exception_msg": "Attempt to override undefined parameter 'app.app_wrong' in 'application[b1_label]" }, "b2": { - "desc": "override values based on labels with libs (second label)", "app.app1": "v_app1", "app.app2": "v_app2[b2_label]", "lib1.p1": "v_p1_lib1", @@ -28,7 +22,6 @@ expected_results = { "lib2.p2": "v_p2_lib2[b2_label]" }, "both": { - "desc": "override values based on labels with libs - invalid override (both labels)", "exception_msg": "Attempt to override undefined parameter 'app.app_wrong' in 'application[b1_label]" - }, + } } diff --git a/tools/test/config_test/test05/mbed_app.json b/tools/test/config_test/override_with_labels/mbed_app.json similarity index 100% rename from tools/test/config_test/test05/mbed_app.json rename to tools/test/config_test/override_with_labels/mbed_app.json diff --git a/tools/test/config_test/test09/targets.json b/tools/test/config_test/override_with_labels/targets.json similarity index 100% rename from tools/test/config_test/test09/targets.json rename to tools/test/config_test/override_with_labels/targets.json diff --git a/tools/test/config_test/override_with_labels/test_data.json b/tools/test/config_test/override_with_labels/test_data.json new file mode 100644 index 0000000000..17f94e5bbb --- /dev/null +++ b/tools/test/config_test/override_with_labels/test_data.json @@ -0,0 +1,19 @@ + + { + "b1": { + "app.app1": "v_app1[b1_label]", + "app.app2": "v_app2" + }, + "b2": { + "app.app1": "v_app1", + "app.app2": "v_app2[b2_label]" + }, + "both": { + "app.app1": "v_app1[b1_label]", + "app.app2": "v_app2[b2_label]" + }, + "base": { + "app.app1": "v_app1", + "app.app2": "v_app2" + } +} diff --git a/tools/test/config_test/test12/lib1/lib2/mbed_lib.json b/tools/test/config_test/parameter_outside_lib/lib1/lib2/mbed_lib.json similarity index 100% rename from tools/test/config_test/test12/lib1/lib2/mbed_lib.json rename to tools/test/config_test/parameter_outside_lib/lib1/lib2/mbed_lib.json diff --git a/tools/test/config_test/test11/lib1/mbed_lib.json b/tools/test/config_test/parameter_outside_lib/lib1/mbed_lib.json similarity index 100% rename from tools/test/config_test/test11/lib1/mbed_lib.json rename to tools/test/config_test/parameter_outside_lib/lib1/mbed_lib.json diff --git a/tools/test/config_test/parameter_outside_lib/test_data.json b/tools/test/config_test/parameter_outside_lib/test_data.json new file mode 100644 index 0000000000..d2af576ceb --- /dev/null +++ b/tools/test/config_test/parameter_outside_lib/test_data.json @@ -0,0 +1,6 @@ + + { + "K64F": { + "exception_msg": "Invalid prefix 'lib2' for parameter name 'lib2.p1' in 'library:lib1[K64F]'" + } +} diff --git a/tools/test/config_test/test21/mbed_app.json b/tools/test/config_test/simple_features/mbed_app.json similarity index 100% rename from tools/test/config_test/test21/mbed_app.json rename to tools/test/config_test/simple_features/mbed_app.json diff --git a/tools/test/config_test/test28/targets.json b/tools/test/config_test/simple_features/targets.json similarity index 100% rename from tools/test/config_test/test28/targets.json rename to tools/test/config_test/simple_features/targets.json diff --git a/tools/test/config_test/simple_features/test_data.json b/tools/test/config_test/simple_features/test_data.json new file mode 100644 index 0000000000..ed7dde2f24 --- /dev/null +++ b/tools/test/config_test/simple_features/test_data.json @@ -0,0 +1,6 @@ + + { + "test_target": { + "expected_features": ["IPV4"] + } +} diff --git a/tools/test/config_test/test01/targets.json b/tools/test/config_test/simple_iheritance/targets.json similarity index 100% rename from tools/test/config_test/test01/targets.json rename to tools/test/config_test/simple_iheritance/targets.json diff --git a/tools/test/config_test/simple_iheritance/test_data.json b/tools/test/config_test/simple_iheritance/test_data.json new file mode 100644 index 0000000000..cac877a7ba --- /dev/null +++ b/tools/test/config_test/simple_iheritance/test_data.json @@ -0,0 +1,27 @@ + + { + "f": { + "target.base1_1": "v_base1_1_f", + "target.base1_2": "v_base1_2_d1", + "target.base1_3": "v_base1_3_b1", + "target.derived1": "v_derived1_d1", + "target.derived2": "v_derived2_f", + "target.base2_1": "v_base2_1_f", + "target.base2_2": "v_base2_2_b2", + "target.f1_1": "v_f1_1_f_override", + "target.f1_2": "v_f1_2_f" + }, + "b1": { + "target.base1_1": "v_base1_1_b1", + "target.base1_2": "v_base1_2_b1", + "target.base1_3": "v_base1_3_b1" + }, + "d1": { + "target.base1_1": "v_base1_1_d1", + "target.base1_2": "v_base1_2_d1", + "target.base1_3": "v_base1_3_b1", + "target.derived1": "v_derived1_d1", + "target.derived2": "v_derived2_d1" + } +} + diff --git a/tools/test/config_test/test01/test_data.py b/tools/test/config_test/test01/test_data.py deleted file mode 100644 index 878ae93690..0000000000 --- a/tools/test/config_test/test01/test_data.py +++ /dev/null @@ -1,46 +0,0 @@ -# Test for configuration data defined in targets -# A base target (B1) defines 3 configuration parameters (base1_1, base1_2 and base1_3) -# A derived target (D1) inherits drom B1 and defines one configuration parameters (derived1 and derived2) and overrides base1_1 and base1_2 -# Another base target (B2) defines its own configuration parameters (base2_1 and base2_2) -# The final target F derives from B2 and D1, defines two configuration paramaters (f1_1 and f1_2) -# and overrides base2_1, base1_1, derived2 and its own configuration parameter f1_1 (which is legal) -# Final result: -# base1_1 must have the value defined in F -# base1_2 must have the value defined in D1 -# base1_3 must have the value defined in B1 -# derived1 must have the value defined in D1 -# derived2 must have the value defined in F -# base2_1 must have the value defined in F -# base2_2 must have the value defined in B2 -# f1_1 must have the value defined and then overriden in F -# f1_2 must have the value defined in F - -expected_results = { - "f": { - "desc": "test multiple target inheritance", - "target.base1_1": "v_base1_1_f", - "target.base1_2": "v_base1_2_d1", - "target.base1_3": "v_base1_3_b1", - "target.derived1": "v_derived1_d1", - "target.derived2": "v_derived2_f", - "target.base2_1": "v_base2_1_f", - "target.base2_2": "v_base2_2_b2", - "target.f1_1": "v_f1_1_f_override", - "target.f1_2": "v_f1_2_f" - }, - "b1": { - "desc": "test with a single base target, no inheritance", - "target.base1_1": "v_base1_1_b1", - "target.base1_2": "v_base1_2_b1", - "target.base1_3": "v_base1_3_b1" - }, - "d1": { - "desc": "test single target inheritance", - "target.base1_1": "v_base1_1_d1", - "target.base1_2": "v_base1_2_d1", - "target.base1_3": "v_base1_3_b1", - "target.derived1": "v_derived1_d1", - "target.derived2": "v_derived2_d1" - } -} - diff --git a/tools/test/config_test/test04/test_data.py b/tools/test/config_test/test04/test_data.py deleted file mode 100644 index 50fbfcdb06..0000000000 --- a/tools/test/config_test/test04/test_data.py +++ /dev/null @@ -1,18 +0,0 @@ -# Similar to test1, but this time B2 attempt to define base1_1. Since base1_1 -# is already defined in B1 and F derives from both B1 and B2, this results -# in an error. However, when building for B2 instead of F, defining base1_1 -# should be OK. - -expected_results = { - "f": { - "desc": "attempt to redefine parameter in target inheritance tree", - "exception_msg": "Parameter name 'base1_1' defined in both 'target:b2' and 'target:b1'" - }, - "b2": { - "desc": "it should be OK to define parameters with the same name in non-related targets", - "target.base2_1": "v_base2_1_b2", - "target.base2_2": "v_base2_2_b2", - "target.base1_1": "v_base1_1_b2" - } -} - diff --git a/tools/test/config_test/test05/test_data.py b/tools/test/config_test/test05/test_data.py deleted file mode 100644 index 65ac4cd718..0000000000 --- a/tools/test/config_test/test05/test_data.py +++ /dev/null @@ -1,29 +0,0 @@ -# This tests overriding configuration values based on target labels. -# Four targets are defined: -# - "base" is the base target, it doesn't define any extra labels -# - "b1" inherits from "base" and adds the "b1_label" label -# - "b2" inherits from "base" and adds the "b2_label" label -# - "both" inherits from both "b1" and "b2", so it inherits both labels - -expected_results = { - "b1": { - "desc": "override values based on labels (first label)", - "app.app1": "v_app1[b1_label]", - "app.app2": "v_app2" - }, - "b2": { - "desc": "override values based on labels (second label)", - "app.app1": "v_app1", - "app.app2": "v_app2[b2_label]" - }, - "both": { - "desc": "override values based on labels (both labels)", - "app.app1": "v_app1[b1_label]", - "app.app2": "v_app2[b2_label]" - }, - "base": { - "desc": "override values based on labels (no labels)", - "app.app1": "v_app1", - "app.app2": "v_app2" - } -} diff --git a/tools/test/config_test/test11/test_data.py b/tools/test/config_test/test11/test_data.py deleted file mode 100644 index 6bcaed1091..0000000000 --- a/tools/test/config_test/test11/test_data.py +++ /dev/null @@ -1,9 +0,0 @@ -# Two libraries (lib1 and lib2) define their own configuration parameters -# lib1 tries to override a configuration parameter in lib2, which raises an error - -expected_results = { - "K64F": { - "desc": "lib1 trying to override a config parameter in lib2", - "exception_msg": "Invalid prefix 'lib2' for parameter name 'lib2.p1' in 'library:lib1[K64F]'" - } -} diff --git a/tools/test/config_test/test12/test_data.py b/tools/test/config_test/test12/test_data.py deleted file mode 100644 index d2489dc773..0000000000 --- a/tools/test/config_test/test12/test_data.py +++ /dev/null @@ -1,14 +0,0 @@ -# Two libraries (lib1 and lib2) define their own configuration parameters -# The application config doesn't have any parameters itself, it just overrides the parameter -# named p1 from both lib1 and lib2. - -expected_results = { - "test_target": { - "desc": "app without its own parameters overrides parameters in other libs", - "lib1.p1": "v_p1_lib1_app", - "lib1.p2": "v_p2_lib1", - "lib1.p3": "v_p3_lib1", - "lib2.p1": "v_p1_lib2_app", - "lib2.p2": "v_p2_lib2" - } -} diff --git a/tools/test/config_test/test13/test_data.py b/tools/test/config_test/test13/test_data.py deleted file mode 100644 index 7d394e84ec..0000000000 --- a/tools/test/config_test/test13/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Create two libraries named "lib1", which must raise an error - -expected_results = { - "K64F": { - "desc": "attempt to configure two libraries named 'lib1'", - "exception_msg": "Library name 'lib1' is not unique" - } -} diff --git a/tools/test/config_test/test14/test_data.py b/tools/test/config_test/test14/test_data.py deleted file mode 100644 index 1db33cd6d4..0000000000 --- a/tools/test/config_test/test14/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Put an invalid key in the application configuration - -expected_results = { - "K64F": { - "desc": "invalid key in mbed_app_config.json", - "exception_msg": "Unknown key(s)" - } -} diff --git a/tools/test/config_test/test15/test_data.py b/tools/test/config_test/test15/test_data.py deleted file mode 100644 index 4518f78783..0000000000 --- a/tools/test/config_test/test15/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Put an invalid key in the library configuration - -expected_results = { - "K64F": { - "desc": "invalid key in mbed_lib_config.json", - "exception_msg": "Unknown key(s)" - } -} diff --git a/tools/test/config_test/test16/test_data.py b/tools/test/config_test/test16/test_data.py deleted file mode 100644 index 5a106b742b..0000000000 --- a/tools/test/config_test/test16/test_data.py +++ /dev/null @@ -1,12 +0,0 @@ -# Macro test: defined macros in the top level app and 2 libs, check if they -# are reported properly. -# The app defines one macro with value the same as lib2, while lib2 defined -# the same macro without value as lib1. Since the definitions are comptabile, -# no error should be raised - -expected_results = { - "test_target": { - "desc": "test macro definitions", - "expected_macros": ["APP1=10", "APP2", "LIB1_1=1","LIB1_2", "LIB2_1=5"] - } -} diff --git a/tools/test/config_test/test17/test_data.py b/tools/test/config_test/test17/test_data.py deleted file mode 100644 index b55da016d1..0000000000 --- a/tools/test/config_test/test17/test_data.py +++ /dev/null @@ -1,9 +0,0 @@ -# Build on top of test16 -# Adds an invalid macro redefinition in the app - -expected_results = { - "K64F": { - "desc": "test invalid macro re-definition in the app", - "exception_msg": "Macro 'LIB2_1' defined in both 'library:lib2' and 'application' with incompatible values" - } -} diff --git a/tools/test/config_test/test18/test_data.py b/tools/test/config_test/test18/test_data.py deleted file mode 100644 index e228833381..0000000000 --- a/tools/test/config_test/test18/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Like test17, but this time the invalid re-definition is in lib2, not in the app - -expected_results = { - "K64F": { - "desc": "test invalid macro re-definition in a library", - "exception_msg": "defined in both" - } -} diff --git a/tools/test/config_test/test19/mbed_app.json b/tools/test/config_test/test19/mbed_app.json deleted file mode 100644 index 6970156cd2..0000000000 --- a/tools/test/config_test/test19/mbed_app.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "macros": [], - "invalid_key": "invalid_value" -} diff --git a/tools/test/config_test/test19/test_data.py b/tools/test/config_test/test19/test_data.py deleted file mode 100644 index 40e250b865..0000000000 --- a/tools/test/config_test/test19/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Test that invalid keys in application configuration are not allowed - -expected_results = { - "K64F": { - "desc": "test invalid key in application config", - "exception_msg": "Unknown key(s) 'invalid_key'" - } -} diff --git a/tools/test/config_test/test20/lib1/mbed_lib.json b/tools/test/config_test/test20/lib1/mbed_lib.json deleted file mode 100644 index a42cdd3eba..0000000000 --- a/tools/test/config_test/test20/lib1/mbed_lib.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "lib1", - "macros": [], - "invalid_key": "invalid_value" -} diff --git a/tools/test/config_test/test20/test_data.py b/tools/test/config_test/test20/test_data.py deleted file mode 100644 index 7e9f6461b9..0000000000 --- a/tools/test/config_test/test20/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Like test19, but this time check invalid key in a library configuration - -expected_results = { - "K64F": { - "desc": "test invalid key in lib config", - "exception_msg": "Unknown key(s) 'invalid_key'" - } -} diff --git a/tools/test/config_test/test21/test_data.py b/tools/test/config_test/test21/test_data.py deleted file mode 100644 index 4f7ae443e9..0000000000 --- a/tools/test/config_test/test21/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing basic features - -expected_results = { - "test_target": { - "desc": "test basic features", - "expected_features": ["IPV4"] - } -} diff --git a/tools/test/config_test/test22/test_data.py b/tools/test/config_test/test22/test_data.py deleted file mode 100644 index 5edfe17891..0000000000 --- a/tools/test/config_test/test22/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing when adding two features - -expected_results = { - "test_target": { - "desc": "test composing features", - "expected_features": ["IPV4", "STORAGE"] - } -} diff --git a/tools/test/config_test/test24/test_data.py b/tools/test/config_test/test24/test_data.py deleted file mode 100644 index a77f026758..0000000000 --- a/tools/test/config_test/test24/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing if features can enable other features - -expected_results = { - "test_target": { - "desc": "test recursive features", - "expected_features": ["IPV4", "STORAGE", "UVISOR"] - } -} diff --git a/tools/test/config_test/test25/test_data.py b/tools/test/config_test/test25/test_data.py deleted file mode 100644 index 360d392130..0000000000 --- a/tools/test/config_test/test25/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing if feature collisions are detected accross recursive features - -expected_results = { - "K64F": { - "desc": "test recursive feature collisions", - "exception_msg": "Configuration conflict. The feature UVISOR both added and removed." - } -} diff --git a/tools/test/config_test/test26/test_data.py b/tools/test/config_test/test26/test_data.py deleted file mode 100644 index 2d16a8bf34..0000000000 --- a/tools/test/config_test/test26/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing if config settings work in recursive features - -expected_results = { - "test_target": { - "desc": "test recursive feature configurations", - "lib2.test": "GOOD" - } -} diff --git a/tools/test/config_test/test27/test_data.py b/tools/test/config_test/test27/test_data.py deleted file mode 100644 index 53853318a4..0000000000 --- a/tools/test/config_test/test27/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing when adding two features - -expected_results = { - "test_target": { - "desc": "test removing features", - "expected_features": [] - } -} diff --git a/tools/test/config_test/test28/test_data.py b/tools/test/config_test/test28/test_data.py deleted file mode 100644 index 4f69bfceef..0000000000 --- a/tools/test/config_test/test28/test_data.py +++ /dev/null @@ -1,8 +0,0 @@ -# Testing when adding two features - -expected_results = { - "test_target": { - "desc": "test uvisor feature", - "expected_features": ["UVISOR"] - } -} diff --git a/tools/test/config_test/test29/test_data.py b/tools/test/config_test/test29/test_data.py deleted file mode 100644 index 935d3d9037..0000000000 --- a/tools/test/config_test/test29/test_data.py +++ /dev/null @@ -1,6 +0,0 @@ -expected_results = { - "K64F": { - "desc": "error when bootloader not found", - "exception_msg": "not found" - } -}