From a48836c5988a280d139e1cd191d4e80810d55352 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 30 Jul 2012 14:37:01 -0400 Subject: [PATCH] --- yaml --- r: 319803 b: refs/heads/master c: 8fddbe9bbfe5771a9d9e5d0c6f5bae3213c20645 h: refs/heads/master i: 319801: 77deb8e9d4d62a7227dda485ff9a51ccd212110d 319799: 6e8bb334609d7960a8b5b502ec507c5342e0f976 v: v3 --- [refs] | 2 +- trunk/tools/testing/ktest/ktest.pl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 115263f25eba..ce94975b4ebb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b1d367dbbeb6646f04a8865ecc2bc454f7dd88f +refs/heads/master: 8fddbe9bbfe5771a9d9e5d0c6f5bae3213c20645 diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl index a022fb7d113d..52b7959cd513 100755 --- a/trunk/tools/testing/ktest/ktest.pl +++ b/trunk/tools/testing/ktest/ktest.pl @@ -623,6 +623,10 @@ sub process_compare { return $lval eq $rval; } elsif ($cmp eq "!=") { return $lval ne $rval; + } elsif ($cmp eq "=~") { + return $lval =~ m/$rval/; + } elsif ($cmp eq "!~") { + return $lval !~ m/$rval/; } my $statement = "$lval $cmp $rval"; @@ -678,7 +682,7 @@ sub process_expression { } } - if ($val =~ /(.*)(==|\!=|>=|<=|>|<)(.*)/) { + if ($val =~ /(.*)(==|\!=|>=|<=|>|<|=~|\!~)(.*)/) { my $ret = process_compare($1, $2, $3); if ($ret < 0) { die "$name: $.: Unable to process comparison\n";