From 9021f8e8e67e99eed8c678b304cd1b450049f3c8 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Fri, 16 Aug 2024 08:53:36 +0200 Subject: [PATCH] LTP: Adapt record_info() output to Micro Signed-off-by: Petr Vorel --- lib/LTP/utils.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/LTP/utils.pm b/lib/LTP/utils.pm index 0057ff3d9bd4..b1e6ea60bd98 100644 --- a/lib/LTP/utils.pm +++ b/lib/LTP/utils.pm @@ -98,8 +98,9 @@ sub log_versions { my $kernel_pkg_log = '/tmp/kernel-pkg.txt'; my $ver_linux_log = '/tmp/ver_linux_before.txt'; my $kernel_config = script_output('for f in "/boot/config-$(uname -r)" "/usr/lib/modules/$(uname -r)/config" /proc/config.gz; do if [ -f "$f" ]; then echo "$f"; break; fi; done'); + my $run_cmd = is_transactional ? 'transactional-update -c run ' : ''; - script_run("rpm -qi $kernel_pkg > $kernel_pkg_log 2>&1"); + script_run("$run_cmd rpm -qi $kernel_pkg > $kernel_pkg_log 2>&1"); upload_logs($kernel_pkg_log, failok => 1); if (get_var('LTP_COMMAND_FILE') || get_var('LIBC_LIVEPATCH')) { @@ -129,9 +130,9 @@ sub log_versions { record_info('KERNEL VERSION', script_output('uname -a')); record_info('KERNEL DEFAULT PKG', script_output("cat $kernel_pkg_log", proceed_on_failure => 1)); - record_info('KERNEL EXTRA PKG', script_output('rpm -qi kernel-default-extra', proceed_on_failure => 1)); + record_info('KERNEL EXTRA PKG', script_output("$run_cmd rpm -qi kernel-default-extra", proceed_on_failure => 1)); - record_info('KERNEL pkg', script_output('rpm -qa | grep kernel', proceed_on_failure => 1)); + record_info('KERNEL pkg', script_output("$run_cmd rpm -qa | grep kernel", proceed_on_failure => 1)); if (get_var('LTP_COMMAND_FILE') || get_var('LIBC_LIVEPATCH')) { record_info('ver_linux', script_output("cat $ver_linux_log", proceed_on_failure => 1));