Patchwork [testsuite] Skip batch-preserve-term-settings.exp tests that cannot work on Windows

login
register
mail settings
Submitter Sandra Loosemore
Date Aug. 13, 2019, 10:18 p.m.
Message ID <4c0e8e6a-271b-cf5f-2c35-9ab3c19e6407@codesourcery.com>
Download mbox | patch
Permalink /patch/34076/
State New
Headers show

Comments

Sandra Loosemore - Aug. 13, 2019, 10:18 p.m.
Here's another in my series of patches to clean up test results on 
remote Windows host.  OK to commit?

-Sandra
Simon Marchi - Aug. 15, 2019, 3:09 a.m.
On 2019-08-13 6:18 p.m., Sandra Loosemore wrote:
> Here's another in my series of patches to clean up test results on 
> remote Windows host.  OK to commit?
> 
> -Sandra
> 

Thanks, this LGTM.

Simon

Patch

commit 9d18683821f58c98722626aa2b2672876b6f513a
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Tue Aug 13 14:43:59 2019 -0700

    Skip batch-preserve-term-settings.exp tests that cannot work on Windows.
    
    This group of tests assume that the gdb "shell" command launches a
    POSIX-compliant shell supporting the PPID environment variable, which
    is used to get gdb's pid for killing it from a remote_exec shell.  But
    on Windows host "shell" launches cmd.exe, which doesn't have an
    equivalent query.
    
    2019-08-13  Sandra Loosemore  <sandra@codesourcery.com>
    
    	gdb/testsuite
    	* gdb.base/batch-preserve-term-settings.exp
    	(test_terminal_settings_preserved_after_sigterm): Skip on Windows.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e4b9616..38689c1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@ 
+2019-08-13  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* gdb.base/batch-preserve-term-settings.exp
+	(test_terminal_settings_preserved_after_sigterm): Skip on Windows.
+
 2019-08-13  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.gdb/selftest.exp (send ^C to child process again): Accept also
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index ebb494b..27b7a7a 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -273,6 +273,13 @@  proc test_terminal_settings_preserved_after_sigterm { } {
     global gdb_prompt
     global shell_prompt_re
 
+    # On Windows, GDB's "shell" command spawns cmd.exe, which does not
+    # understand PPID.  So we're out of luck even if the test harness
+    # uses a remote_exec shell with a working "kill" command.
+    if [ishost *-*-mingw*] {
+	return
+    }
+
     if ![spawn_shell] {
 	return
     }