debug/gosym: avoid calling the shell in test

Change-Id: I95bf62c0f2d77dd67515921e6aefa511cce8d95d
Reviewed-on: https://go-review.googlesource.com/10633
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/debug/gosym/pclntab_test.go b/src/debug/gosym/pclntab_test.go
index c6943a631acb6b0e353d2629c6a6da1338a6f2c5..53f3e952d62bdbf7f2d12c535aa701ecedc45da5 100644 (file)
--- a/src/debug/gosym/pclntab_test.go
+++ b/src/debug/gosym/pclntab_test.go
@@ -6,7 +6,6 @@ package gosym
 
 import (
        "debug/elf"
-       "fmt"
        "io/ioutil"
        "os"
        "os/exec"
@@ -30,10 +29,6 @@ func dotest(self bool) bool {
        if self && runtime.GOOS != "linux" {
                return false
        }
-       // Command below expects "sh", so Unix.
-       if runtime.GOOS == "windows" || runtime.GOOS == "plan9" {
-               return false
-       }
        if pclinetestBinary != "" {
                return true
        }
@@ -49,9 +44,14 @@ func dotest(self bool) bool {
        // the resulting binary looks like it was built from pclinetest.s,
        // but we have renamed it to keep it away from the go tool.
        pclinetestBinary = filepath.Join(pclineTempDir, "pclinetest")
-       command := fmt.Sprintf("go tool asm -o %s.o pclinetest.asm && go tool link -H linux -E main -o %s %s.o",
-               pclinetestBinary, pclinetestBinary, pclinetestBinary)
-       cmd := exec.Command("sh", "-c", command)
+       cmd := exec.Command("go", "tool", "asm", "-o", pclinetestBinary+".o", "pclinetest.asm")
+       cmd.Stdout = os.Stdout
+       cmd.Stderr = os.Stderr
+       if err := cmd.Run(); err != nil {
+               panic(err)
+       }
+       cmd = exec.Command("go", "tool", "link", "-H", "linux", "-E", "main",
+               "-o", pclinetestBinary, pclinetestBinary+".o")
        cmd.Stdout = os.Stdout
        cmd.Stderr = os.Stderr
        if err := cmd.Run(); err != nil {