mirror of
https://github.com/golang/go
synced 2024-11-18 06:54:49 -07:00
os: run more of TestExecutable on OpenBSD
On OpenBSD, Executable relies on Args[0]. Removing the forgery on that OS allows the rest of the test to run. See #19453 Change-Id: Idf99f86894de5c702893791bc3684f8665f4019d Reviewed-on: https://go-review.googlesource.com/46398 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
parent
1d3a0df4bb
commit
b3301865a0
@ -29,12 +29,6 @@ func TestExecutable(t *testing.T) {
|
||||
t.Fatalf("filepath.Rel: %v", err)
|
||||
}
|
||||
|
||||
if runtime.GOOS == "openbsd" {
|
||||
// The rest of the test doesn't work on OpenBSD,
|
||||
// which relies on argv[0].
|
||||
t.Skipf("skipping remainder of test on %s", runtime.GOOS)
|
||||
}
|
||||
|
||||
cmd := &osexec.Cmd{}
|
||||
// make child start with a relative program path
|
||||
cmd.Dir = dir
|
||||
@ -42,6 +36,10 @@ func TestExecutable(t *testing.T) {
|
||||
// forge argv[0] for child, so that we can verify we could correctly
|
||||
// get real path of the executable without influenced by argv[0].
|
||||
cmd.Args = []string{"-", "-test.run=XXXX"}
|
||||
if runtime.GOOS == "openbsd" {
|
||||
// OpenBSD relies on argv[0]
|
||||
cmd.Args[0] = fn
|
||||
}
|
||||
cmd.Env = append(os.Environ(), fmt.Sprintf("%s=1", executable_EnvVar))
|
||||
out, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user