Commit 6977b4c7 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Pull ktest fix from Steven Rostedt:
 "ktest has one fix needed for this merge window - fix parsing of ELSE
  IF in reading config file"

* tag 'ktest-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Fix ELSE IF statements
parents 69e9576b 95f57838
...@@ -840,7 +840,9 @@ sub __read_config { ...@@ -840,7 +840,9 @@ sub __read_config {
if ($rest =~ /\sIF\s+(.*)/) { if ($rest =~ /\sIF\s+(.*)/) {
# May be a ELSE IF section. # May be a ELSE IF section.
if (!process_if($name, $1)) { if (process_if($name, $1)) {
$if_set = 1;
} else {
$skip = 1; $skip = 1;
} }
$rest = ""; $rest = "";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment