On Wed, Apr 4, 2018 at 6:03 AM, Andreas Schwab <[email protected]> wrote:
>
> For some reason signal_cgo_test.go needs to run an interactive shell,
> but suppresses reading the startup files. This causes the shell history
> file to be clobbered, by using different history settings than usual.
> Avoid that by setting HOME to / so that the shell cannot write a history
> file.
Thanks. This has already been fixed in a different way in the master
libgo sources, so I've just copied that change into gccgo.
Bootstrapped and ran os/signal test on x86_64-pc-linux-gnu. Committed
to mainline.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 259445)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-2c7093358e5f5ebeb102d44d1036ca0a807d46a5
+b367349d85f315e94e10ee2d76a7c6a46b993dcb
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/go/os/signal/signal_cgo_test.go
===================================================================
--- libgo/go/os/signal/signal_cgo_test.go (revision 259359)
+++ libgo/go/os/signal/signal_cgo_test.go (working copy)
@@ -89,6 +89,8 @@ func TestTerminalSignal(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
cmd := exec.CommandContext(ctx, bash, "--norc", "--noprofile", "-i")
+ // Clear HISTFILE so that we don't read or clobber the user's bash
history.
+ cmd.Env = append(os.Environ(), "HISTFILE=")
cmd.Stdin = slave
cmd.Stdout = slave
cmd.Stderr = slave
