ktest: Let IF keyword take comparisons

[linux-2.6-block.git] / tools / testing / ktest / ktest.pl

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index c76e18f00c4479528c51d1ab489ec5d4f86e9648..ed20d6881ec9869f7cf0c000e0e718e6382507cd 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -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);