lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Check parent options for iterated tests
This commit is contained in:
Linus Torvalds
2011-11-23 09:50:42 -08:00
parent 5907c5f8ad f9dfb65b05
commit f10cdea68b
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/testing/ktest/ktest.pl
View File

@@ -747,6 +747,18 @@ sub __eval_option {
# Add space to evaluate the character before $ # Add space to evaluate the character before $
$option = " $option"; $option = " $option";
my $retval = ""; my $retval = "";
my $repeated = 0;
my $parent = 0;
foreach my $test (keys %repeat_tests) {
if ($i >= $test &&
$i < $test + $repeat_tests{$test}) {
$repeated = 1;
$parent = $test;
last;
}
}
while ($option =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) { while ($option =~ /(.*?[^\\])\$\{(.*?)\}(.*)/) {
my $start = $1; my $start = $1;
@@ -760,10 +772,14 @@ sub __eval_option {
# otherwise see if the default OPT (without [$i]) exists. # otherwise see if the default OPT (without [$i]) exists.
my $o = "$var\[$i\]"; my $o = "$var\[$i\]";
my $parento = "$var\[$parent\]";
if (defined($opt{$o})) { if (defined($opt{$o})) {
$o = $opt{$o}; $o = $opt{$o};
$retval = "$retval$o"; $retval = "$retval$o";
} elsif ($repeated && defined($opt{$parento})) {
$o = $opt{$parento};
$retval = "$retval$o";
} elsif (defined($opt{$var})) { } elsif (defined($opt{$var})) {
$o = $opt{$var}; $o = $opt{$var};
$retval = "$retval$o"; $retval = "$retval$o";