From ebb4019f01c946537c3ea6b99f0eca5283552a8f Mon Sep 17 00:00:00 2001 From: chigotc Date: Tue, 16 Apr 2019 14:07:41 +0200 Subject: [PATCH] unix: 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: I102d0f180a4f0204f107db900f2134c5af1d52c3 Reviewed-on: https://go-review.googlesource.com/c/sys/+/172258 Reviewed-by: Tobias Klauser Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot --- unix/syscall_unix_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unix/syscall_unix_test.go b/unix/syscall_unix_test.go index 0e6f1c7b..0d1c87ce 100644 --- a/unix/syscall_unix_test.go +++ b/unix/syscall_unix_test.go @@ -169,6 +169,11 @@ func TestPassFD(t *testing.T) { t.Skip("cannot exec subprocess on iOS, skipping test") } + 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 @@ -190,11 +195,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)