[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190509174630.26713-2-msys.mizuma@gmail.com>
Date: Thu, 9 May 2019 13:46:26 -0400
From: Masayoshi Mizuma <msys.mizuma@...il.com>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: Masayoshi Mizuma <msys.mizuma@...il.com>,
Masayoshi Mizuma <m.mizuma@...fujitsu.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH 1/5] ktest: introduce _get_grub_index
From: Masayoshi Mizuma <m.mizuma@...fujitsu.com>
Introduce _get_grub_index() to deal with Boot Loader
Specification (BLS) and cleanup.
Signed-off-by: Masayoshi Mizuma <m.mizuma@...fujitsu.com>
---
tools/testing/ktest/ktest.pl | 37 ++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 751e32a31ed4..3862b23672f7 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1859,6 +1859,43 @@ sub run_scp_mod {
return run_scp($src, $dst, $cp_scp);
}
+sub _get_grub_index {
+
+ my ($command, $target, $skip) = @_;
+
+ return if (defined($grub_number) && defined($last_grub_menu) &&
+ $last_grub_menu eq $grub_menu && defined($last_machine) &&
+ $last_machine eq $machine);
+
+ doprint "Find $reboot_type menu ... ";
+ $grub_number = -1;
+
+ my $ssh_grub = $ssh_exec;
+ $ssh_grub =~ s,\$SSH_COMMAND,$command,g;
+
+ open(IN, "$ssh_grub |")
+ or dodie "unable to execute $command";
+
+ my $found = 0;
+
+ while (<IN>) {
+ if (/$target/) {
+ $grub_number++;
+ $found = 1;
+ last;
+ } elsif (/$skip/) {
+ $grub_number++;
+ }
+ }
+ close(IN);
+
+ dodie "Could not find '$grub_menu' through $command on $machine"
+ if (!$found);
+ doprint "$grub_number\n";
+ $last_grub_menu = $grub_menu;
+ $last_machine = $machine;
+}
+
sub get_grub2_index {
return if (defined($grub_number) && defined($last_grub_menu) &&
--
2.20.1
Powered by blists - more mailing lists