OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os: pass -s to hostname on AIX

Browse Source 
Reviewed-on: https://go-review.googlesource.com/79375

From-SVN: r255738
This commit is contained in:
Ian Lance Taylor 2017-12-16 01:49:54 +00:00
parent fe6272cc44
commit be528ae9aa
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
97eb3f61cf1c2cc01b9db6ed20e39bc04573c207
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

12
libgo/go/os/os_test.go
View File

@ -1440,7 +1440,7 @@ func TestOpenNoName(t *testing.T) {
}
}
func runBinHostname(t *testing.T) string {
func runBinHostname(t *testing.T, argv []string) string {
// Run /bin/hostname and collect output.
r, w, err := Pipe()
if err != nil {
@ -1448,7 +1448,7 @@ func runBinHostname(t *testing.T) string {
}
defer r.Close()
const path = "/bin/hostname"
p, err := StartProcess(path, []string{"hostname"}, &ProcAttr{Files: []*File{nil, w, Stderr}})
p, err := StartProcess(path, argv, &ProcAttr{Files: []*File{nil, w, Stderr}})
if err != nil {
if _, err := Stat(path); IsNotExist(err) {
t.Skipf("skipping test; test requires %s but it does not exist", path)
@ -1514,7 +1514,13 @@ func TestHostname(t *testing.T) {
if err != nil {
t.Fatalf("%v", err)
}
want := runBinHostname(t)
var want string
if runtime.GOOS == "aix" {
want = runBinHostname(t, []string{"hostname", "-s"})
} else {
want = runBinHostname(t, []string{"hostname"})
}
if hostname != want {
i := strings.Index(hostname, ".")
if i < 0 || hostname[0:i] != want {