Commit 6977b4c7 authored Oct 01, 2012 by Linus Torvalds

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

tools/testing/ktest/ktest.pl

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 = "";