diff options
Diffstat (limited to 'zephyr/zmake')
| -rw-r--r-- | zephyr/zmake/tests/test_project.py | 8 | ||||
| -rw-r--r-- | zephyr/zmake/tests/test_version.py | 8 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/project.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/zephyr/zmake/tests/test_project.py b/zephyr/zmake/tests/test_project.py index d729b79d71..dd57a5c9c9 100644 --- a/zephyr/zmake/tests/test_project.py +++ b/zephyr/zmake/tests/test_project.py @@ -72,7 +72,7 @@ def test_find_dts_overlays(modules): "board": board, "toolchain": "foo", "output-type": "elf", - "supported-zephyr-versions": ["v2.5"], + "supported-zephyr-versions": ["v2.6"], } ) as project: config = project.find_dts_overlays(dict(enumerate(module_paths))) @@ -106,7 +106,7 @@ def test_prune_modules(modules): "board": "native_posix", "toolchain": "coreboot-sdk", "output-type": "elf", - "supported-zephyr-versions": ["v2.5"], + "supported-zephyr-versions": ["v2.6"], "modules": modules, } ) as project: @@ -127,7 +127,7 @@ def test_prune_modules_unavailable(): "board": "native_posix", "toolchain": "coreboot-sdk", "output-type": "elf", - "supported-zephyr-versions": ["v2.5"], + "supported-zephyr-versions": ["v2.6"], "modules": ["hal_stm32", "cmsis"], } ) as project: @@ -143,7 +143,7 @@ def test_find_projects_empty(tmp_path): YAML_FILE = """ supported-zephyr-versions: - - v2.5 + - v2.6 toolchain: coreboot-sdk output-type: npcx """ diff --git a/zephyr/zmake/tests/test_version.py b/zephyr/zmake/tests/test_version.py index 7f1304066c..9e99ff09fb 100644 --- a/zephyr/zmake/tests/test_version.py +++ b/zephyr/zmake/tests/test_version.py @@ -52,7 +52,7 @@ def _setup_example_repos(tmp_path): "board": "foo", "toolchain": "bar", "output-type": "raw", - "supported-zephyr-versions": ["v2.5"], + "supported-zephyr-versions": ["v2.6"], }, ) # Has one commit. @@ -61,7 +61,7 @@ def _setup_example_repos(tmp_path): _git_add( zephyr_base, zephyr_base / "VERSION", - "VERSION_MAJOR=2\nVERSION_MINOR=5\nPATCHLEVEL=99\n", + "VERSION_MAJOR=2\nVERSION_MINOR=6\nPATCHLEVEL=99\n", ) _git_commit(zephyr_base, "Added version file") @@ -86,7 +86,7 @@ def test_version_string(tmp_path): project, zephyr_base, modules = _setup_example_repos(tmp_path) assert ( version.get_version_string(project, zephyr_base, modules) - == "prj_v2.5.4-mod1:02fd7a,mod2:b5991f,os:2c65cb" + == "prj_v2.6.4-mod1:02fd7a,mod2:b5991f,os:377d26" ) @@ -94,5 +94,5 @@ def test_version_string_static(tmp_path): project, zephyr_base, modules = _setup_example_repos(tmp_path) assert ( version.get_version_string(project, zephyr_base, modules, static=True) - == "prj_v2.5.0-STATIC" + == "prj_v2.6.0-STATIC" ) diff --git a/zephyr/zmake/zmake/project.py b/zephyr/zmake/zmake/project.py index 914d67876f..956971a52a 100644 --- a/zephyr/zmake/zmake/project.py +++ b/zephyr/zmake/zmake/project.py @@ -61,7 +61,7 @@ class ProjectConfig: "type": "array", "items": { "type": "string", - "enum": ["v2.5", "v2.6"], + "enum": ["v2.6"], }, "minItems": 1, "uniqueItems": True, |