linux-kernel - [PATCH][GIT PULL] ktest: Fix ELSE IF statements

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <1349110326.22822.120.camel@gandalf.local.home>
Date:	Mon, 01 Oct 2012 12:52:06 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	LKML <linux-kernel@...r.kernel.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>
Subject: [PATCH][GIT PULL] ktest: Fix ELSE IF statements


Linus,

ktest has one fix needed for this merge window.

-- Steve

Please pull the latest ktest-v3.7 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git
ktest-v3.7

Head SHA1: 5c5dcb8b1dd19ece1c82049e4afe95f0f24b77bf


Steven Rostedt (1):
      ktest: Fix ELSE IF statements

----
 tools/testing/ktest/ktest.pl |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---------------------------
commit 95f57838418358e93212e9dddd60d3502c7f8e2e
Author: Steven Rostedt <srostedt@...hat.com>
Date:   Wed Sep 26 14:48:17 2012 -0400

    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@...dmis.org>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 52b7959..c05bcd2 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 = "";


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/