From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934165AbbBDTv5 (ORCPT ); Wed, 4 Feb 2015 14:51:57 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.232]:9069 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161186AbbBDTv1 (ORCPT ); Wed, 4 Feb 2015 14:51:27 -0500 Message-Id: <20150204195124.362110271@goodmis.org> User-Agent: quilt/0.61-1 Date: Wed, 04 Feb 2015 14:50:55 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Josh Poimboeuf Subject: [for-next][PATCH 8/9] ktest: Cleanup terminal on dodie() failure References: <20150204195047.818126814@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0008-ktest-Cleanup-terminal-on-dodie-failure.patch X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josh Poimboeuf If dodie() is called with the console open, restore the terminal's original settings before dying. Link: http://lkml.kernel.org/r/20150130025453.GB20952@treble.redhat.com Signed-off-by: Josh Poimboeuf Signed-off-by: Steven Rostedt --- tools/testing/ktest/ktest.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index ca20ce2dc8b6..840803b3cd41 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1407,6 +1407,11 @@ sub dodie { print " See $opt{LOG_FILE} for more info.\n"; } + if ($monitor_cnt) { + # restore terminal settings + system("stty $stty_orig"); + } + die @_, "\n"; } @@ -1449,7 +1454,7 @@ sub exec_console { close($pts); exec $console or - dodie "Can't open console $console"; + die "Can't open console $console"; } sub open_console { -- 2.1.4