Skip to content

Commit

Permalink
config: Remove support for target.requires
Browse files Browse the repository at this point in the history
target.requires was never a valid target_override. See
ARMmbed#162 for details.

Partially reverts 6a99b43.
  • Loading branch information
rwalton-arm committed Jul 29, 2021
1 parent 59cb81b commit e0c5706
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,7 @@ def _get_app_filter_labels(mbed_app_data: dict, config: Config) -> None:


def _get_file_filter_overrides(mbed_app_data: dict) -> dict:
return {
"overrides": [
override
for override in mbed_app_data.get("overrides", [])
if override.modifier or override.name == "requires"
]
}
return {"overrides": [override for override in mbed_app_data.get("overrides", []) if override.modifier]}


@dataclass(frozen=True)
Expand Down
4 changes: 0 additions & 4 deletions src/mbed_tools/build/_internal/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ def __setitem__(self, key: Hashable, item: Any) -> None:
def _handle_overrides(self, overrides: Iterable[Override]) -> None:
for override in overrides:
logger.debug("Applying override '%s.%s'='%s'", override.namespace, override.name, repr(override.value))
if override.name == "requires":
self.data["requires"] = self.data.get("requires", set()) | override.value
continue

if override.name in self.data:
_apply_override(self.data, override)
continue
Expand Down
24 changes: 0 additions & 24 deletions tests/build/test_generate_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,30 +456,6 @@ def test_requires_config_option(program):
assert "MBED_LFS_READ_SIZE=64" not in config_text


def test_target_requires_config_option(program):
create_mbed_app_json(program.root, target_overrides={"*": {"target.requires": ["ble"]}})
create_mbed_lib_json(
program.mbed_os.root / "bare-metal" / "mbed_lib.json",
"ble",
target_overrides={"*": {"target.requires": ["platform"]}},
)
create_mbed_lib_json(
program.mbed_os.root / "platform" / "mbed_lib.json", "platform", config={"stdio-baud-rate": {"value": 9600}},
)
create_mbed_lib_json(
program.mbed_os.root / "storage" / "mbed_lib.json",
"filesystem",
config={"read_size": {"macro_name": "MBED_LFS_READ_SIZE", "value": 64}},
)

generate_config("K64F", "GCC_ARM", program)

config_text = (program.files.cmake_build_dir / CMAKE_CONFIG_FILE).read_text()

assert "MBED_CONF_PLATFORM_STDIO_BAUD_RATE=9600" in config_text
assert "MBED_LFS_READ_SIZE=64" not in config_text


def test_config_parsed_when_mbed_os_outside_project_root(program_in_mbed_os_subdir, matching_target_and_filter):
program = program_in_mbed_os_subdir
target, target_filter = matching_target_and_filter
Expand Down

0 comments on commit e0c5706

Please sign in to comment.