From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbaCIOaB (ORCPT ); Sun, 9 Mar 2014 10:30:01 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:44918 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbaCIOaA (ORCPT ); Sun, 9 Mar 2014 10:30:00 -0400 Date: Sun, 09 Mar 2014 23:29:55 +0900 Message-ID: <87ha7730nw.wl%satoru.takeuchi@gmail.com> From: Satoru Takeuchi To: LKML Cc: Steven Rostedt Subject: [PATCH 1/3] ktest: add 2nd parameter of run_command() to set the redirect target file User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/23.4 Mule/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Satoru Takeuchi If we'd like to set the redirect target file of run_command(), we should define $redirect before this function and should undef it after this function. Since it's user-unfriendly, add 2nd parameter of run_command() for this purpose. Signed-off-by: Satoru Takeuchi Cc: Steven Rostedt --- tools/testing/ktest/ktest.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 4063156..f731ef6 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -149,7 +149,6 @@ my $bisect_ret_abort; my $bisect_ret_default; my $in_patchcheck = 0; my $run_test; -my $redirect; my $buildlog; my $testlog; my $dmesg; @@ -1529,7 +1528,7 @@ sub fail { } sub run_command { - my ($command) = @_; + my ($command, $redirect) = @_; my $dolog = 0; my $dord = 0; my $pid; @@ -2265,9 +2264,7 @@ sub build { # Run old config regardless, to enforce min configurations make_oldconfig; - $redirect = "$buildlog"; - my $build_ret = run_command "$make $build_options"; - undef $redirect; + my $build_ret = run_command "$make $build_options", $buildlog; if (defined($post_build)) { # Because a post build may change the kernel version @@ -2360,9 +2357,7 @@ sub child_run_test { $poweroff_on_error = 0; $die_on_failure = 1; - $redirect = "$testlog"; - run_command $run_test or $failed = 1; - undef $redirect; + run_command $run_test, $testlog or $failed = 1; exit $failed; } -- 1.9.0