Skip to content

Commit

Permalink
LTP: Adapt record_info() output to Micro
Browse files Browse the repository at this point in the history
Signed-off-by: Petr Vorel <[email protected]>
  • Loading branch information
pevik committed Aug 21, 2024
1 parent efa55ff commit db5e21a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions lib/LTP/utils.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit db5e21a

Please sign in to comment.