From f68244e6660d86b3d0be9258a5d35c109abc749f Mon Sep 17 00:00:00 2001
From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Mon, 13 May 2019 13:15:10 -0700
Subject: [PATCH] cmd/objdump: ensure that test executable files are distinct
This fixes test failures introduced by CL 176901.
Change-Id: I133299ba3be3a15ced076c95e4833ba6070d7eb7
Reviewed-on: https://go-review.googlesource.com/c/go/+/176903
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
src/cmd/objdump/objdump_test.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go
index 8d73c016c60..b24371ddea5 100644
--- a/src/cmd/objdump/objdump_test.go
+++ b/src/cmd/objdump/objdump_test.go
@@ -5,6 +5,7 @@
package main
import (
+ "crypto/md5"
"flag"
"fmt"
"go/build"
@@ -101,7 +102,8 @@ func testDisasm(t *testing.T, printCode bool, flags ...string) {
goarch = f[1]
}
- hello := filepath.Join(tmp, "hello.exe")
+ hash := md5.Sum([]byte(fmt.Sprintf("%v-%v", flags, printCode)))
+ hello := filepath.Join(tmp, fmt.Sprintf("hello-%x.exe", hash))
args := []string{"build", "-o", hello}
args = append(args, flags...)
args = append(args, "testdata/fmthello.go")
--
GitLab