summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2012-09-26 14:48:17 -0400
committerSteven Rostedt <rostedt@goodmis.org>2012-09-26 14:48:17 -0400
commit95f57838418358e93212e9dddd60d3502c7f8e2e (patch)
tree41ee29ae494dfa2fb2ba93e186767d48e0bacd21
parent979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff)
downloadlinux-3.10-95f57838418358e93212e9dddd60d3502c7f8e2e.tar.gz
linux-3.10-95f57838418358e93212e9dddd60d3502c7f8e2e.tar.bz2
linux-3.10-95f57838418358e93212e9dddd60d3502c7f8e2e.zip
ktest: Fix ELSE IF statements
The ELSE IF statements do not work as expected if another ELSE statement follows. This is because the $if_set is not set. If the ELSE IF condition is true, the following ELSE should be ignored. But because the $if_set is not set, the following ELSE will also be executed. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xtools/testing/ktest/ktest.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 52b7959cd51..c05bcd293d8 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -840,7 +840,9 @@ sub __read_config {
if ($rest =~ /\sIF\s+(.*)/) {
# May be a ELSE IF section.
- if (!process_if($name, $1)) {
+ if (process_if($name, $1)) {
+ $if_set = 1;
+ } else {
$skip = 1;
}
$rest = "";