flag: fix TestExitCode on Plan 9

CL 221427 added TestExitCode. This test is failing
on Plan 9 because ExitCode is always equal to 1
on error since Plan 9 use error strings.

This change fixes TestExitCode by checking that
ExitCode is equal to 1 on error instead of the
specific value.

Fixes #38237.

Change-Id: Ie269722e731e275e5bfc51644c1fa6be76525f1f
Reviewed-on: https://go-review.googlesource.com/c/go/+/227158
Run-TryBot: David du Colombier <0intro@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>

diff --git a/src/flag/flag_test.go b/src/flag/flag_test.go
index a7450f3f48387e7714444d56865ade1c47caebd7..a01a5e4cea2ffef91bc2bc05cf88edf1aa94a7ee 100644 (file)
--- a/src/flag/flag_test.go
+++ b/src/flag/flag_test.go
@@ -13,6 +13,7 @@ import (
        "io/ioutil"
        "os"
        "os/exec"
+       "runtime"
        "sort"
        "strconv"
        "strings"
@@ -599,6 +600,10 @@ func TestExitCode(t *testing.T) {
                )
                cmd.Run()
                got := cmd.ProcessState.ExitCode()
+               // ExitCode is either 0 or 1 on Plan 9.
+               if runtime.GOOS == "plan9" && test.expectExit != 0 {
+                       test.expectExit = 1
+               }
                if got != test.expectExit {
                        t.Errorf("unexpected exit code for test case %+v \n: got %d, expect %d",
                                test, got, test.expectExit)