summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-11-09 12:20:21 -0500
committerSteven Rostedt <rostedt@goodmis.org>2010-11-18 11:23:12 -0500
commit9be2e6b590b5d9cb6d6e38b6362a552bbcb118e0 (patch)
tree9c4960a32c1b957e4edfab9cf74ce37dfa3699d8
parentd1fbd7e6a6a4c67ab895a0219a2bbcf09d039c3a (diff)
downloadblackbird-op-linux-9be2e6b590b5d9cb6d6e38b6362a552bbcb118e0.tar.gz
blackbird-op-linux-9be2e6b590b5d9cb6d6e38b6362a552bbcb118e0.zip
ktest: Use different temp config name for minconfig
By using the "use_config" for minconfig and addconfig we risk trying to copy itself to itself, which will cause an unexpected failure. Use a different name instead. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xtools/testing/ktest/ktest.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 0d1080548ea6..a7a74f015ef3 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1735,9 +1735,9 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
$minconfig = $addconfig;
} elsif (defined($addconfig)) {
- run_command "cat $addconfig $minconfig > $tmpdir/use_config" or
+ run_command "cat $addconfig $minconfig > $tmpdir/add_config" or
dodie "Failed to create temp config";
- $minconfig = "$tmpdir/use_config";
+ $minconfig = "$tmpdir/add_config";
}
my $checkout = $opt{"CHECKOUT[$i]"};
OpenPOWER on IntegriCloud