Move exit_status_set_internal_vars out of GLOBAL_CURDIR

Fixes these testsuite fails on Windows:
FAIL: gdb.base/shell.exp: shell success exitcode
FAIL: gdb.base/shell.exp: shell fail exitcode

The convenience variables $_shell_exitcode and $_shell_exitsignal don't
depend on the GLOBAL_CURDIR define.

gdb/ChangeLog:

2020-05-27  Hannes Domani  <ssbssa@yahoo.de>

	* cli/cli-cmds.c (shell_escape): Move exit_status_set_internal_vars.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2f2958c599bca904dc47e6e10e5982bdfa1c23b9..487a5783882676ed7b3fc6f278dfcef7778628c5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-27  Hannes Domani  <ssbssa@yahoo.de>
+
+       * cli/cli-cmds.c (shell_escape): Move exit_status_set_internal_vars.
+
 2020-05-27  Hannes Domani  <ssbssa@yahoo.de>
 
        * exec.c (exec_file_attach): Use errno value of first openp failure.

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index fdc8758bcd09fbdb2b86771e5c891b0fb58f1715..cd6f7856599d1d672c0f738a713f767b0bc8b6dc 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -830,8 +830,8 @@ shell_escape (const char *arg, int from_tty)
   /* Make sure to return to the directory GDB thinks it is, in case
      the shell command we just ran changed it.  */
   chdir (current_directory);
-  exit_status_set_internal_vars (rc);
 #endif
+  exit_status_set_internal_vars (rc);
 #else /* Can fork.  */
   int status, pid;