From: Shenghou Ma <minux@golang.org>
Date: Thu, 17 Dec 2015 21:37:30 +0000 (-0500)
Subject: test: fix linkmain test
X-Git-Tag: go1.6beta2~222
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=63f0aac58681efdb864a7bc6988cfb835734a278;p=gostls13.git

test: fix linkmain test

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

diff --git a/test/linkmain_run.go b/test/linkmain_run.go
index a5d2c79b26..55de481a81 100644
--- a/test/linkmain_run.go
+++ b/test/linkmain_run.go
@@ -29,7 +29,7 @@ func run(cmdline string) {
 	cmd := exec.Command(args[0], args[1:]...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Printf("$ %s\n", strings.Join(args, " "))
+		fmt.Printf("$ %s\n", cmdline)
 		fmt.Println(string(out))
 		fmt.Println(err)
 		cleanup()
@@ -37,11 +37,12 @@ func run(cmdline string) {
 	}
 }
 
-func runFail(args ...string) {
+func runFail(cmdline string) {
+	args := strings.Fields(cmdline)
 	cmd := exec.Command(args[0], args[1:]...)
 	out, err := cmd.CombinedOutput()
 	if err == nil {
-		fmt.Printf("$ %s\n", strings.Join(args, " "))
+		fmt.Printf("$ %s\n", cmdline)
 		fmt.Println(string(out))
 		fmt.Println("SHOULD HAVE FAILED!")
 		cleanup()
@@ -57,8 +58,8 @@ func main() {
 	run("go tool link -o linkmain.exe linkmain.a")
 
 	// linkmain.go is not
-	run("go tool compile -o linkmain.o linkmain.go")
-	run("go tool compile -pack -o linkmain.a linkmain.go")
+	run("go tool compile -o linkmain1.o linkmain.go")
+	run("go tool compile -pack -o linkmain1.a linkmain.go")
 	runFail("go tool link -o linkmain.exe linkmain1.o")
 	runFail("go tool link -o linkmain.exe linkmain1.a")
 	cleanup()