Skip to contentSkip to conversation

test: inconsistent bootm tests

PATCH New Heinrich Schuchardt 3 participants 8 messages Jan 17, 2021 – Jan 30, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 test: inconsistent bootm tests

Excluding ut bootm in test/cmd_ut.c but compiling test/bootm.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nop] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nospace] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent_var] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_both] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_var]

Only compile test/bootm.c on the sandbox.

Fixes f158ba15ee0f ("bootm: Add tests for fixup_silent_linux()")
---
 test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
test/Makefile +1 -1
index d4323f9963..7d3fc29493 100644
@@ -4,8 +4,8 @@
 
 ifneq ($(CONFIG_SANDBOX),)
 obj-$(CONFIG_$(SPL_)CMDLINE) += bloblist.o
-endif
 obj-$(CONFIG_$(SPL_)CMDLINE) += bootm.o
+endif
 obj-$(CONFIG_$(SPL_)CMDLINE) += cmd/
 obj-$(CONFIG_$(SPL_)CMDLINE) += cmd_ut.o
 obj-$(CONFIG_$(SPL_)CMDLINE) += command_ut.o

--
2.29.2

#1 lore raw

PATCH 2/3 test: inconsistent string tests

Excluding ut str in test/cmd_ut.c but compiling test/str_ut.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

FAILED test/py/tests/test_ut.py::test_ut[ut_str_upper]

Allow to compile test/str_ut.c on all boards.

---
 test/cmd_ut.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
test/cmd_ut.c +1 -2
index fad1c899a4..90674d5de5 100644
@@ -89,9 +89,8 @@ static struct cmd_tbl cmd_ut_sub[] = {
 	U_BOOT_CMD_MKENT(bloblist, CONFIG_SYS_MAXARGS, 1, do_ut_bloblist,
 			 "", ""),
 	U_BOOT_CMD_MKENT(bootm, CONFIG_SYS_MAXARGS, 1, do_ut_bootm, "", ""),
-	U_BOOT_CMD_MKENT(str, CONFIG_SYS_MAXARGS, 1, do_ut_str,
-			 "", ""),
 #endif
+	U_BOOT_CMD_MKENT(str, CONFIG_SYS_MAXARGS, 1, do_ut_str, "", ""),
 };
 
 static int do_ut_all(struct cmd_tbl *cmdtp, int flag, int argc,

--
2.29.2

#2 lore raw

PATCH 2/3 test: inconsistent string tests

Quoted 5 lines · Heinrich Schuchardt

Excluding ut str in test/cmd_ut.c but compiling test/str_ut.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

Quoted 8 lines

FAILED test/py/tests/test_ut.py::test_ut[ut_str_upper]

Allow to compile test/str_ut.c on all boards.

---
 test/cmd_ut.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
#3 lore raw

PATCH 2/3 test: inconsistent string tests

In reply to Heinrich Schuchardt
Quoted 10 lines · Heinrich Schuchardt

Excluding ut str in test/cmd_ut.c but compiling test/str_ut.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

FAILED test/py/tests/test_ut.py::test_ut[ut_str_upper]

Allow to compile test/str_ut.c on all boards.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/a750a00d/attachment.sig>
#4 lore raw

PATCH 3/3 test: missing build dependency for test_print.c

In reply to Heinrich Schuchardt

test_print.c requires CONFIG_CONSOLE_RECORD=y.

---
 test/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
test/lib/Makefile +1 -1
index 98a9abf40e..97c11e35a8 100644
@@ -7,7 +7,7 @@ obj-$(CONFIG_EFI_LOADER) += efi_device_path.o
 obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o
 obj-y += hexdump.o
 obj-y += lmb.o
-obj-y += test_print.o
+obj-$(CONFIG_CONSOLE_RECORD) += test_print.o
 obj-$(CONFIG_SSCANF) += sscanf.o
 obj-y += string.o
 obj-$(CONFIG_ERRNO_STR) += test_errno_str.o

--
2.29.2

#5 lore raw

PATCH 3/3 test: missing build dependency for test_print.c

Quoted 21 lines · Heinrich Schuchardt

test_print.c requires CONFIG_CONSOLE_RECORD=y.

---
 test/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
test/lib/Makefile +1 -2
index 98a9abf40e..97c11e35a8 100644
@@ -7,7 +7,7 @@ obj-$(CONFIG_EFI_LOADER) += efi_device_path.o
 obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o
 obj-y += hexdump.o
 obj-y += lmb.o
-obj-y += test_print.o
+obj-$(CONFIG_CONSOLE_RECORD) += test_print.o
 obj-$(CONFIG_SSCANF) += sscanf.o
 obj-y += string.o
 obj-$(CONFIG_ERRNO_STR) += test_errno_str.o
--
Quoted 2 lines

2.29.2

af033ec8b4ebe ("test: test/lib/test_print.c depends on CONSOLE_RECORD") was merged today fixing the issue.

Best regards

Heinrich

#6 lore raw

PATCH 1/3 test: inconsistent bootm tests

In reply to Heinrich Schuchardt
Quoted 13 lines · Heinrich Schuchardt

Excluding ut bootm in test/cmd_ut.c but compiling test/bootm.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nop] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nospace] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent_var] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_both] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_var]

Quoted 7 lines

Only compile test/bootm.c on the sandbox.

Fixes f158ba15ee0f ("bootm: Add tests for fixup_silent_linux()")
---
 test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
#7 lore raw

PATCH 1/3 test: inconsistent bootm tests

In reply to Heinrich Schuchardt
Quoted 12 lines · Heinrich Schuchardt

Excluding ut bootm in test/cmd_ut.c but compiling test/bootm.c results in failure of the Python test invoking the C unit tests as observed on sipeed_riscv_smode_defconfig:

FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nop] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_nospace] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_silent_var] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_both] FAILED test/py/tests/test_ut.py::test_ut[ut_bootm_subst_var]

Quoted 5 lines

Only compile test/bootm.c on the sandbox.

Fixes f158ba15ee0f ("bootm: Add tests for fixup_silent_linux()")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/20d8e3a0/attachment.sig>