Commit 68911069 authored Apr 17, 2019 by Masayoshi Mizuma Committed by Steven Rostedt (VMware) Apr 17, 2019

ktest: Add support for meta characters in GRUB_MENU

ktest fails if meta characters are in GRUB_MENU, for example
GRUB_MENU = 'Fedora (test)'

The failure happens because the meta characters are not escaped,
so the menu doesn't match in any entries in GRUB_FILE.

Use quotemeta() to escape the meta characters.

Link: http://lkml.kernel.org/r/20190417235823.18176-1-msys.mizuma@gmail.com



Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent fca797f1

tools/testing/ktest/ktest.pl

+4 −2

Original line number	Diff line number	Diff line
		@@ -1878,9 +1878,10 @@ sub get_grub2_index {
		or dodie "unable to get $grub_file";

		my $found = 0;
		my $grub_menu_qt = quotemeta($grub_menu);

		while (<IN>) {
		if (/^menuentry.*$grub_menu/) {
		if (/^menuentry.*$grub_menu_qt/) {
		$grub_number++;
		$found = 1;
		last;
		@@ -1921,9 +1922,10 @@ sub get_grub_index {
		or dodie "unable to get menu.lst";

		my $found = 0;
		my $grub_menu_qt = quotemeta($grub_menu);

		while (<IN>) {
		if (/^\stitle\s+$grub_menu\s$/) {
		if (/^\stitle\s+$grub_menu_qt\s$/) {
		$grub_number++;
		$found = 1;
		last;

Admin message