From c81b830023d33b51384f14245bee195c65c1f7b8 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 27 Feb 2019 12:14:59 -0500 Subject: [PATCH] cmd/dist: execute misc/cgo/testso{,var} as regular tests, not host tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit These tests use runtime.GOOS and runtime.GOARCH to determine whether to run, so must be built and run using the destination's — not the host's — GOOS and GOARCH. Updates #30228 Change-Id: I6774dacd01c68b395fca8ca61f70d5879270af8a Reviewed-on: https://go-review.googlesource.com/c/164117 Run-TryBot: Bryan C. Mills Reviewed-by: Jay Conrod --- src/cmd/dist/test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 6f2eee19df..025da74a15 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -674,8 +674,8 @@ func (t *tester) registerTests() { // recompile the entire standard library. If make.bash ran with // special -gcflags, that's not true. if t.cgoEnabled && gogcflags == "" { - t.registerHostTest("testso", "../misc/cgo/testso", "misc/cgo/testso", ".") - t.registerHostTest("testsovar", "../misc/cgo/testsovar", "misc/cgo/testsovar", ".") + t.registerTest("testso", "../misc/cgo/testso", t.goTest(), t.timeout(600)) + t.registerTest("testsovar", "../misc/cgo/testsovar", t.goTest(), t.timeout(600)) if t.supportedBuildmode("c-archive") { t.registerHostTest("testcarchive", "../misc/cgo/testcarchive", "misc/cgo/testcarchive", ".") } -- 2.50.0