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

Commit cad96669 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ktest: Evaluate options before processing them 



All options can take variables "${var}". Before doing any processing
or decision making on the content of an option, evaluate it incase
there are variables that may change the outcome.

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

tools/testing/ktest/ktest.pl

+6 −5
Original line number Diff line number Diff line
@@ -416,10 +416,12 @@ sub process_variables { 
sub set_value {

    my ($lvalue, $rvalue, $override, $overrides, $name) = @_;



    if ($buildonly && $lvalue =~ /^TEST_TYPE(\[.*\])?$/ && $rvalue ne "build") {

    my $prvalue = process_variables($rvalue);



    if ($buildonly && $lvalue =~ /^TEST_TYPE(\[.*\])?$/ && $prvalue ne "build") {

	# Note if a test is something other than build, then we

	# will need other manditory options.

	if ($rvalue ne "install") {

	if ($prvalue ne "install") {

	    $buildonly = 0;

	} else {

	    # install still limits some manditory options.
@@ -435,13 +437,12 @@ sub set_value { 
	    }

	    die "$name: $.: Option $lvalue defined more than once!\n$extra";

	}

	${$overrides}{$lvalue} = $rvalue;

	${$overrides}{$lvalue} = $prvalue;

    }

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

	delete $opt{$lvalue};

    } else {

	$rvalue = process_variables($rvalue);

	$opt{$lvalue} = $rvalue;

	$opt{$lvalue} = $prvalue;

    }

}