From b39d0eab902cb6b90aa99bcf11ca622c00219c7c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Chigot?= Date: Tue, 16 Apr 2019 14:19:18 +0200 Subject: [PATCH] syscall: move helper handler before AIX handler in TestPassFD The AIX special handler which skips this test if unix network isn't supported, doesn't need to be called inside the helper process. Change-Id: I7ff2c4e6b20eceb977380294858cae63034ffe0d Reviewed-on: https://go-review.googlesource.com/c/go/+/172160 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Tobias Klauser --- src/syscall/syscall_unix_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/syscall/syscall_unix_test.go b/src/syscall/syscall_unix_test.go index 3462fb2446..62109ac3e7 100644 --- a/src/syscall/syscall_unix_test.go +++ b/src/syscall/syscall_unix_test.go @@ -132,6 +132,11 @@ func TestFcntlFlock(t *testing.T) { func TestPassFD(t *testing.T) { testenv.MustHaveExec(t) + if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" { + passFDChild() + return + } + if runtime.GOOS == "aix" { // Unix network isn't properly working on AIX 7.2 with Technical Level < 2 out, err := exec.Command("oslevel", "-s").Output() @@ -152,11 +157,6 @@ func TestPassFD(t *testing.T) { } - if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" { - passFDChild() - return - } - tempDir, err := ioutil.TempDir("", "TestPassFD") if err != nil { t.Fatal(err) -- 2.50.0