From 43e254a646a2780e8e76171ba9318e5f5dc36fb2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Dec 2025 19:08:10 +0100 Subject: [PATCH] support/testing: ltp-testsuite: replace runltp by kirk The run log of this ltp-testsuite test shows: INFO: runltp script is deprecated, try kirk https://github.com/linux-test-project/kirk This commit updates this test to replace this deprecated runltp shell script with the newer kirk Python script. The logic of this runtime test remains the same: it runs a small number of 'read' system call tests, and checks there is no failures and at least one test succeed. Cc: Petr Vorel Signed-off-by: Julien Olivain Acked-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- .../tests/package/test_ltp_testsuite.py | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/support/testing/tests/package/test_ltp_testsuite.py b/support/testing/tests/package/test_ltp_testsuite.py index a85ceb35a6..6ff59b9700 100644 --- a/support/testing/tests/package/test_ltp_testsuite.py +++ b/support/testing/tests/package/test_ltp_testsuite.py @@ -1,3 +1,4 @@ +import json import os import infra.basetest @@ -7,6 +8,7 @@ class TestLtpTestsuite(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ """ BR2_PACKAGE_LTP_TESTSUITE=y + BR2_PACKAGE_PYTHON3=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="600M" @@ -21,19 +23,24 @@ class TestLtpTestsuite(infra.basetest.BRTest): options=["-drive", f"file={drive},if=scsi,format=raw"]) self.emulator.login() - # We run a reduced number of tests (read syscall tests) for a - # fast execution. See "runltp --help" for option details. - cmd = "/usr/lib/ltp-testsuite/runltp" - cmd += " -p -q" - cmd += " -s ^read0[0-9]*" - cmd += " -l /tmp/ltp.log" - cmd += " -o /tmp/ltp.output" - cmd += " -C /tmp/ltp.failed" - cmd += " -T /tmp/ltp.tconf" - self.assertRunOk(cmd) + ltp_root = "/usr/lib/ltp-testsuite" + report_file = "/tmp/ltp-report.json" - # We print the LTP run log and check there was zero failure in - # our test selection. - out, ret = self.emulator.run("cat /tmp/ltp.log") + # We run a reduced number of tests (read syscall tests) for a + # fast execution. See "kirk --help" for option details. + cmd = f"LTPROOT={ltp_root}" + cmd += f" {ltp_root}/kirk" + cmd += " --sut host" + cmd += " --framework ltp" + cmd += " --run-suite syscalls" + cmd += " --run-pattern '^read0[0-9]*'" + cmd += f" --json-report {report_file}" + self.assertRunOk(cmd, timeout=30) + + # We print the LTP report and check there was at least one + # passed test and zero failure in our selection. + out, ret = self.emulator.run(f"cat {report_file} && echo") self.assertEqual(ret, 0) - self.assertIn("Total Failures: 0", out) + report = json.loads("".join(out)) + self.assertEqual(report['stats']['failed'], 0) + self.assertGreater(report['stats']['passed'], 0)