From patchwork Wed Jul 29 16:10:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 7918 Received: (qmail 16474 invoked by alias); 29 Jul 2015 16:10:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 16463 invoked by uid 89); 29 Jul 2015 16:10:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: mail-qg0-f52.google.com Received: from mail-qg0-f52.google.com (HELO mail-qg0-f52.google.com) (209.85.192.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 29 Jul 2015 16:10:10 +0000 Received: by qgeu79 with SMTP id u79so6709777qge.1 for ; Wed, 29 Jul 2015 09:10:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=blK2TWL2mgj0c+Bb7PJmF6dpl9+d6T5c6O5gNfHcdSA=; b=f4mi2OQtMWwdtXGSDbNLKAIQ/oZvUzRxpvoUR0Qsz3iEssAswSQGXJw5E0UTVYyas0 cdpQRrxbl8B1j7mPAvAaJ+I6A672mjoyrPyOaFBqWEbWub9830Sn6cUyaEXbz/elLfPK RlnmjTnH+38Ak8MHYwhwa7tZ4k4rAyzcr8XpoZACJ8fkMrb/Sus+MZBBM0eH6+//KHgr PTjy1UkTd+ocSj5D5LmPMfq0hXCkDNJGCuuoKCEw642FHGrHZ61nY3DPJ4bd8+5t3k+k Z702uEAROo8jiniETDT3JCf2y9ULtOAfThQ6x4+0aV6iVaPfKsw7p7KDD3tFzl2IiiM3 aLDA== X-Gm-Message-State: ALoCoQmK4BuAfiVTtpJuWnj5cfyIq8PrBKbWfATIXaEUXsj1MZ+X89ok5OpXGKQL4MEmIrVdVlb7 X-Received: by 10.140.102.144 with SMTP id w16mr61454715qge.82.1438186208578; Wed, 29 Jul 2015 09:10:08 -0700 (PDT) Received: from localhost.localdomain (ool-4353acd8.dyn.optonline.net. [67.83.172.216]) by smtp.gmail.com with ESMTPSA id s91sm14037095qge.44.2015.07.29.09.10.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Jul 2015 09:10:07 -0700 (PDT) From: Patrick Palka To: gdb-patches@sourceware.org Cc: Patrick Palka Subject: [PATCH] Test that terminal settings are restored after quitting via SIGTERM Date: Wed, 29 Jul 2015 12:10:03 -0400 Message-Id: <1438186203-13183-1-git-send-email-patrick@parcs.ath.cx> Tested on x86_64 Debian Stretch, native, gdbserver and extended-gdbserver. Also tested that the various error paths, like if $PPID is empty or if SIGTERM did not not kill GDB, function correctly. gdb/testsuite/ChangeLog: * gdb.base/batch-preserve-term-settings.exp (send_quit_command): New proc. (test_terminal_settings_preserved_after_sigterm): New test. --- .../gdb.base/batch-preserve-term-settings.exp | 116 +++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp index ca6f173..a4c8796 100644 --- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp +++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp @@ -176,6 +176,33 @@ proc test_terminal_settings_preserved {} { exit_shell } +# Send the quit command to GDB and make sure it exits. + +proc send_quit_command { test_name } { + global shell_prompt_re + + set test $test_name + send_gdb "quit\n" + gdb_expect { + -re "(y or n)" { + send_gdb "y\n" + exp_continue + } + -re ".*$shell_prompt_re$" { + pass $test + return + } + timeout { + fail "$test (timeout)" + return 0 + } + eof { + fail "$test (eof)" + return 0 + } + } +} + # Check that quitting from the CLI via the "quit" command does not leave the # terminal in the wrong state. The GDB commands CMDS are executed before # quitting. @@ -254,6 +281,91 @@ proc test_terminal_settings_preserved_after_cli_exit { cmds } { exit_shell } +# Check that sending SIGTERM kills GDB and does not leave the terminal in the +# wrong state. + +proc test_terminal_settings_preserved_after_sigterm { } { + global file_arg + global GDB INTERNAL_GDBFLAGS GDBFLAGS + global gdb_prompt + global shell_prompt_re + + if ![spawn_shell] { + return + } + + set saved_gdbflags $GDBFLAGS + + set stty_supported [run_stty "stty before" stty_before] + + set test "start gdb" + send_gdb "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS [host_info gdb_opts]\n" + gdb_expect { + -re "$gdb_prompt $" { + pass $test + } + timeout { + fail "$test (timeout)" + } + eof { + fail "$test (eof)" + } + } + + # Retrieve the pid of gdb with the gdb command "shell echo $PPID" + set gdb_pid -1 + set test "run shell echo \$PPID" + send_gdb "shell echo \$PPID\n" + gdb_expect { + -re ".*\r\n(\\d+)\r\n$gdb_prompt $" { + set gdb_pid $expect_out(1,string) + pass $test + } + -re ".*\r\n\r\n$gdb_prompt $" { + fail "$test (no \$PPID)" + } + timeout { + fail "$test (timeout)" + } + eof { + fail "$test (eof)" + } + } + + set test "kill gdb with SIGTERM" + if { $gdb_pid == -1 } { + fail "$test (no pid)" + send_quit_command "quit gdb" + } else { + remote_exec host "kill -TERM $gdb_pid" + set gdb_killed 0 + gdb_expect { + -re ".*$shell_prompt_re$" { + pass $test + set gdb_killed 1 + } + default { + fail "$test (did not quit)" + } + } + + if !$gdb_killed { + send_quit_command "quit gdb" + } + } + + set test "terminal settings preserved" + if $stty_supported { + run_stty "stty after" stty_after + + gdb_assert [string equal $stty_before $stty_after] $test + } else { + unsupported "$test (no stty)" + } + + exit_shell +} + with_test_prefix "batch run" { test_terminal_settings_preserved } @@ -269,3 +381,7 @@ with_test_prefix "cli exit after start cmd" { with_test_prefix "cli exit after run cmd" { test_terminal_settings_preserved_after_cli_exit { "run" } } + +with_test_prefix "cli exit after SIGTERM" { + test_terminal_settings_preserved_after_sigterm +}