From dea8ea9f7733feac666f3d73e00ebdc8ad062838 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 15 Jan 2019 17:04:56 -0600 Subject: [PATCH] Add failing test that asserts mbed_app.json can require --- .../requires_omit_lib/bl/lib1/mbed_lib.json | 6 ++++++ .../test/config/requires_omit_lib/mbed_app.json | 11 +++++++++++ .../requires_omit_lib/storage/lib2/mbed_lib.json | 8 ++++++++ tools/test/config/requires_omit_lib/targets.json | 16 ++++++++++++++++ .../test/config/requires_omit_lib/test_data.json | 8 ++++++++ 5 files changed, 49 insertions(+) create mode 100644 tools/test/config/requires_omit_lib/bl/lib1/mbed_lib.json create mode 100644 tools/test/config/requires_omit_lib/mbed_app.json create mode 100644 tools/test/config/requires_omit_lib/storage/lib2/mbed_lib.json create mode 100644 tools/test/config/requires_omit_lib/targets.json create mode 100644 tools/test/config/requires_omit_lib/test_data.json diff --git a/tools/test/config/requires_omit_lib/bl/lib1/mbed_lib.json b/tools/test/config/requires_omit_lib/bl/lib1/mbed_lib.json new file mode 100644 index 0000000000..bf687e968f --- /dev/null +++ b/tools/test/config/requires_omit_lib/bl/lib1/mbed_lib.json @@ -0,0 +1,6 @@ +{ + "name": "lib1", + "config": { + "test": "BAD" + } +} diff --git a/tools/test/config/requires_omit_lib/mbed_app.json b/tools/test/config/requires_omit_lib/mbed_app.json new file mode 100644 index 0000000000..f189ccda12 --- /dev/null +++ b/tools/test/config/requires_omit_lib/mbed_app.json @@ -0,0 +1,11 @@ +{ + "requires" : ["lib1"], + "target_overrides": { + "should_fail": { + "lib2.test": "GOOD" + }, + "should_pass": { + "lib1.test": "GOOD" + } + } +} diff --git a/tools/test/config/requires_omit_lib/storage/lib2/mbed_lib.json b/tools/test/config/requires_omit_lib/storage/lib2/mbed_lib.json new file mode 100644 index 0000000000..5fd4a81cce --- /dev/null +++ b/tools/test/config/requires_omit_lib/storage/lib2/mbed_lib.json @@ -0,0 +1,8 @@ +{ + "name": "lib2", + "config": { + "test": { + "value": "BAD" + } + } +} diff --git a/tools/test/config/requires_omit_lib/targets.json b/tools/test/config/requires_omit_lib/targets.json new file mode 100644 index 0000000000..40ff29520d --- /dev/null +++ b/tools/test/config/requires_omit_lib/targets.json @@ -0,0 +1,16 @@ +{ + "should_fail": { + "supported_toolchains": ["GCC_ARM"], + "core": "Cortex-M0", + "extra_labels": [], + "features": [], + "default_lib": "std" + }, + "should_pass": { + "supported_toolchains": ["GCC_ARM"], + "core": "Cortex-M0", + "extra_labels": [], + "features": [], + "default_lib": "std" + } +} diff --git a/tools/test/config/requires_omit_lib/test_data.json b/tools/test/config/requires_omit_lib/test_data.json new file mode 100644 index 0000000000..cbbf0e5f25 --- /dev/null +++ b/tools/test/config/requires_omit_lib/test_data.json @@ -0,0 +1,8 @@ +{ + "should_fail": { + "exception_msg": "Attempt to override undefined parameter 'lib2.test' in 'application[should_fail]'" + }, + "should_pass": { + "lib1.test": "GOOD" + } +}