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

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

ktest: Let IF keyword take comparisons 



Allow ==, !=, <=, >=, <, and > to be used in IF statements
to compare if a section should be processed or not.

For example:

BITS := 32

DEFAULTS IF ${BITS} == 32
MIN_CONFIG = ${CONFIG_DIR}/config-32
ELSE
MIN_CONFIG = ${CONFIG_DIR}/config-64

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

tools/testing/ktest/ktest.pl

+48 −6
Original line number Diff line number Diff line
@@ -361,11 +361,47 @@ sub set_variable { 
    }

}



sub process_compare {

    my ($lval, $cmp, $rval) = @_;



    # remove whitespace



    $lval =~ s/^\s*//;

    $lval =~ s/\s*$//;



    $rval =~ s/^\s*//;

    $rval =~ s/\s*$//;



    if ($cmp eq "==") {

	return $lval eq $rval;

    } elsif ($cmp eq "!=") {

	return $lval ne $rval;

    }



    my $statement = "$lval $cmp $rval";

    my $ret = eval $statement;



    # $@ stores error of eval

    if ($@) {

	return -1;

    }



    return $ret;

}



sub process_if {

    my ($name, $value) = @_;



    my $val = process_variables($value);



    if ($val =~ /(.*)(==|\!=|>=|<=|>|<)(.*)/) {

	my $ret = process_compare($1, $2, $3);

	if ($ret < 0) {

	    die "$name: $.: Unable to process comparison\n";

	}

	return $ret;

    }



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

	return 0;

    } elsif ($val =~ /^\s*\d+\s*$/) {
@@ -428,8 +464,8 @@ sub read_config { 
		$repeat_tests{"$test_num"} = $repeat;

	    }



	    if ($rest =~ /\sIF\s+(\S*)(.*)/) {

		$rest = $2;

	    if ($rest =~ /\sIF\s+(.*)/) {

		$rest = "";

		if (process_if($name, $1)) {

		    $if_set = 1;

		} else {
@@ -461,14 +497,14 @@ sub read_config { 
		$skip = 0;

	    }



	    if ($rest =~ /\sIF\s+(\S*)(.*)/) {

	    if ($rest =~ /\sIF\s+(.*)/) {

		$if = 1;

		$rest = $2;

		if (process_if($name, $1)) {

		    $if_set = 1;

		} else {

		    $skip = 1;

		}

		$rest = "";

	    } else {

		$if = 0;

	    }
@@ -477,26 +513,32 @@ sub read_config { 
		die "$name: $.: Gargbage found after DEFAULTS\n$_";

	    }



	} elsif (/^\s*ELSE(.*)$/) {

	} elsif (/^\s*ELSE\b(.*)$/) {

	    if (!$if) {

		die "$name: $.: ELSE found with out matching IF section\n$_";

	    }

	    $rest = $1;

	    if ($if_set) {

		$skip = 1;

		$rest = "";

	    } else {

		$skip = 0;



		if ($rest =~ /\sIF\s+(\S*)(.*)/) {

		if ($rest =~ /\sIF\s+(.*)/) {

		    # May be a ELSE IF section.

		    if (!process_if($name, $1)) {

			$skip = 1;

		    }

		    $rest = "";

		} else {

		    $if = 0;

		}

	    }



	    if ($rest !~ /^\s*$/) {

		die "$name: $.: Gargbage found after DEFAULTS\n$_";

	    }



	} elsif (/^\s*([A-Z_\[\]\d]+)\s*=\s*(.*?)\s*$/) {



	    next if ($skip);

tools/testing/ktest/sample.conf

+14 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ 
# the same option name under the same test or as default

# ktest will fail to execute, and no tests will run.

#

#

#

# Both TEST_START and DEFAULTS sections can also have the IF keyword

# The value after the IF must evaluate into a 0 or non 0 positive

# integer, and can use the config variables (explained below).
@@ -110,6 +112,18 @@ 
# ELSE

# BUILD_TYPE = useconfig:${CONFIG_DIR}/config-network

#

# The if statement may also have comparisons that will and for

# == and !=, strings may be used for both sides.

#

# BOX_TYPE := x86_32

#

# DEFAULTS IF ${BOX_TYPE} == x86_32

# BUILD_TYPE = useconfig:${CONFIG_DIR}/config-32

# ELSE

# BUILD_TYPE = useconfig:${CONFIG_DIR}/config-64

#







#### Config variables ####

#