]> Cypherpunks repositories - gostls13.git/commitdiff
syscall: move helper handler before AIX handler in TestPassFD
authorClément Chigot <clement.chigot@atos.net>
Tue, 16 Apr 2019 12:19:18 +0000 (14:19 +0200)
committerTobias Klauser <tobias.klauser@gmail.com>
Tue, 16 Apr 2019 13:25:16 +0000 (13:25 +0000)
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 <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
src/syscall/syscall_unix_test.go

index 3462fb244681fd33d6eca82a44e61b2178474db7..62109ac3e7fa000db2971220201c4451f306f301 100644 (file)
@@ -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)