Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 815e2bd7 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ktest: Evaluate variables entered on the command line 



When ktest.pl is called without any arguments, or if the config
file does not exist, ktest.pl will ask the user for some information.
Some of these questions are code paths. Allowing the user to type
${PWD} for the current directory greatly simplifies these entries.

Add variable processing to the entered values.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 7bf51073

tools/testing/ktest/ktest.pl

+6 −4
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ sub read_yn { 


sub get_ktest_config {

    my ($config) = @_;

    my $ans;



    return if (defined($opt{$config}));
@@ -263,16 +264,17 @@ sub get_ktest_config { 
	if (defined($default{$config})) {

	    print "\[$default{$config}\] ";

	}

	$entered_configs{$config} = <STDIN>;

	$entered_configs{$config} =~ s/^\s*(.*\S)\s*$/$1/;

	if ($entered_configs{$config} =~ /^\s*$/) {

	$ans = <STDIN>;

	$ans =~ s/^\s*(.*\S)\s*$/$1/;

	if ($ans =~ /^\s*$/) {

	    if ($default{$config}) {

		$entered_configs{$config} = $default{$config};

		$ans = $default{$config};

	    } else {

		print "Your answer can not be blank\n";

		next;

	    }

	}

	$entered_configs{$config} = process_variables($ans);

	last;

    }

}