From 8d26c3ffa5ede892fc34ab6e184e55a6014af1c2 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Fri, 28 Oct 2011 07:01:40 -0400 Subject: [PATCH] --- yaml --- r: 275183 b: refs/heads/master c: 815e2bd7d609da9c7615ea28a3990064a394312f h: refs/heads/master i: 275181: c2519be04c374c1149ce6d6677f0f74553a11359 275179: 23fba189795f992effb2adff1c7fb6d6941f3b0c 275175: 1314e4a478cff4ed9e5b34f3546443c20f6a7df7 275167: 4baf1ed572033806c8c00321c79abb5dc7d32846 v: v3 --- [refs] | 2 +- trunk/tools/testing/ktest/ktest.pl | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4ee3445244f3..497f2392ee2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bf5107347d94bb056c5a0cf78f09e499c3d8f48 +refs/heads/master: 815e2bd7d609da9c7615ea28a3990064a394312f diff --git a/trunk/tools/testing/ktest/ktest.pl b/trunk/tools/testing/ktest/ktest.pl index 9d9ee321a3dc..30e2befd6f2a 100755 --- a/trunk/tools/testing/ktest/ktest.pl +++ b/trunk/tools/testing/ktest/ktest.pl @@ -250,6 +250,7 @@ sub read_yn { sub get_ktest_config { my ($config) = @_; + my $ans; return if (defined($opt{$config})); @@ -263,16 +264,17 @@ sub get_ktest_config { if (defined($default{$config})) { print "\[$default{$config}\] "; } - $entered_configs{$config} = ; - $entered_configs{$config} =~ s/^\s*(.*\S)\s*$/$1/; - if ($entered_configs{$config} =~ /^\s*$/) { + $ans = ; + $ans =~ s/^\s*(.*\S)\s*$/$1/; + if ($ans =~ /^\s*$/) { if ($default{$config}) { - $entered_configs{$config} = $default{$config}; + $ans = $default{$config}; } else { print "Your answer can not be blank\n"; next; } } + $entered_configs{$config} = process_variables($ans); last; } }