summaryrefslogtreecommitdiff
path: root/tools/testing
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 21:13:47 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 21:13:47 +0400
commit6977b4c7736e8809b7959c66875a16c0bbcf2152 (patch)
tree4063167be935320f13c56f4495af1d05312cfff8 /tools/testing
parent69e9576bf283b0ee3423642d7e7dbe4b3a16e455 (diff)
parent95f57838418358e93212e9dddd60d3502c7f8e2e (diff)
downloadlinux-6977b4c7736e8809b7959c66875a16c0bbcf2152.tar.xz
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
Diffstat (limited to 'tools/testing')
-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 52b7959cd513..c05bcd293d8c 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 = "";