LTP: Adapt record_info() output to Micro

By using enter_trup_shell and exit_trup_shell. Signed-off-by: Petr Vorel <[email protected]>
os-autoinst · Aug 21, 2024 · c14f2b4 · c14f2b4
1 parent efa55ff
commit c14f2b4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/LTP/utils.pm b/lib/LTP/utils.pm
@@ -97,6 +97,9 @@ sub log_versions {
       (is_rt ? 'kernel-rt' : get_kernel_flavor);
     my $kernel_pkg_log = '/tmp/kernel-pkg.txt';
     my $ver_linux_log = '/tmp/ver_linux_before.txt';
+
+    enter_trup_shell(global_options => '-c') if is_transactional;
+
     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');
 
     script_run("rpm -qi $kernel_pkg > $kernel_pkg_log 2>&1");
@@ -129,16 +132,17 @@ 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("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("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));
     }
 
     script_run('env');
     script_run('aa-enabled; aa-status');
+    exit_trup_shell if is_transactional;
 }
 
 sub export_ltp_env {