mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-12-19 16:31:27 +01:00
e482fdbbca
This reverts commit 4d84fa1261eb27d57687f2e4c404a78b8653c183, reversing changes made to b82a1fa7ddc7f3be2f3b75898d5dc44c34420bdd. I had missed some feedback on this series from earlier, and we have since had reports of regressions due to this as well. For now, revert this. Signed-off-by: Tom Rini <trini@konsulko.com>
106 lines
2.8 KiB
Python
106 lines
2.8 KiB
Python
# SPDX-License-Identifier: GPL-2.0+
|
|
# Copyright (c) 2025
|
|
#
|
|
# Test that mkimage validates image references in configurations
|
|
|
|
import os
|
|
import subprocess
|
|
import pytest
|
|
import fit_util
|
|
import re
|
|
|
|
@pytest.mark.boardspec('sandbox')
|
|
@pytest.mark.requiredtool('dtc')
|
|
def test_fit_invalid_image_reference(ubman):
|
|
"""Test that mkimage fails when configuration references a missing image"""
|
|
|
|
its_fname = fit_util.make_fname(ubman, "invalid.its")
|
|
itb_fname = fit_util.make_fname(ubman, "invalid.itb")
|
|
kernel = fit_util.make_kernel(ubman, 'kernel.bin', 'kernel')
|
|
|
|
# Write ITS with an invalid reference to a nonexistent image
|
|
its_text = '''
|
|
/dts-v1/;
|
|
|
|
/ {
|
|
images {
|
|
kernel@1 {
|
|
description = "Test Kernel";
|
|
data = /incbin/("kernel.bin");
|
|
type = "kernel";
|
|
arch = "sandbox";
|
|
os = "linux";
|
|
compression = "none";
|
|
load = <0x40000>;
|
|
entry = <0x40000>;
|
|
};
|
|
};
|
|
|
|
configurations {
|
|
default = "conf@1";
|
|
conf@1 {
|
|
kernel = "kernel@1";
|
|
fdt = "notexist";
|
|
};
|
|
};
|
|
};
|
|
'''
|
|
|
|
with open(its_fname, 'w') as f:
|
|
f.write(its_text)
|
|
|
|
mkimage = os.path.join(ubman.config.build_dir, 'tools/mkimage')
|
|
cmd = [mkimage, '-f', its_fname, itb_fname]
|
|
|
|
result = subprocess.run(cmd, capture_output=True, text=True)
|
|
|
|
assert result.returncode != 0, "mkimage should fail due to missing image reference"
|
|
assert "references undefined image 'notexist'" in result.stderr
|
|
|
|
@pytest.mark.boardspec('sandbox')
|
|
@pytest.mark.requiredtool('dtc')
|
|
def test_fit_invalid_default_config(ubman):
|
|
"""Test that mkimage fails when default config is missing"""
|
|
|
|
its_fname = fit_util.make_fname(ubman, "invalid.its")
|
|
itb_fname = fit_util.make_fname(ubman, "invalid.itb")
|
|
kernel = fit_util.make_kernel(ubman, 'kernel.bin', 'kernel')
|
|
|
|
# Write ITS with an invalid reference to a nonexistent default config
|
|
its_text = '''
|
|
/dts-v1/;
|
|
|
|
/ {
|
|
images {
|
|
kernel@1 {
|
|
description = "Test Kernel";
|
|
data = /incbin/("kernel.bin");
|
|
type = "kernel";
|
|
arch = "sandbox";
|
|
os = "linux";
|
|
compression = "none";
|
|
load = <0x40000>;
|
|
entry = <0x40000>;
|
|
};
|
|
};
|
|
|
|
configurations {
|
|
default = "conf@1";
|
|
conf@2 {
|
|
kernel = "kernel@1";
|
|
};
|
|
};
|
|
};
|
|
'''
|
|
|
|
with open(its_fname, 'w') as f:
|
|
f.write(its_text)
|
|
|
|
mkimage = os.path.join(ubman.config.build_dir, 'tools/mkimage')
|
|
cmd = [mkimage, '-f', its_fname, itb_fname]
|
|
|
|
result = subprocess.run(cmd, capture_output=True, text=True)
|
|
|
|
assert result.returncode != 0, "mkimage should fail due to missing default config"
|
|
assert re.search(r"Default configuration '.*' not found under /configurations", result.stderr)
|